merged stuff together hopefully

src/kern.c

@@ -58,13 +58,10 @@ void kernel_main(multiboot_info* mbt, uint32_t magic)
     int o=0;
     int j=5/o;
     serial_hexword(j);    
-<<<<<<< HEAD
     test_mem();
     test_idt();
-=======
-    serial_writestring("\n");
     while(true)
-	serial_writestring("");
-    asm ("hlt");
->>>>>>> Unified SW/HW interrupts, HW works now
+    {
+	asm("hlt");
+    }
 }

src/test.c

@@ -8,7 +8,6 @@ void test_idt()
 {
     asm ("int $0x80");
     asm ("int $0x90");
-    asm ("hlt");
 }
 
 void test_mem()