diff --git a/Makefile b/Makefile
index 64e4a70..c4f5406 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ test32: kernel loader
 
 debug: kernel loader
 	qemu-system-x86_64 -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int -s -S -enable-kvm 2> qemu.log &
-=======
+
 test32: kaleid
 	@qemu-system-i386 -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int -enable-kvm 2> qemu.log &
 	@ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 64 > loader_disasm64.asm
@@ -132,7 +132,6 @@ test32: kaleid
 
 debug: kaleid
 	@qemu-system-x86_64 -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int -s -S -enable-kvm 2> qemu.log &
->>>>>>> master
 	@ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 64 > loader_disasm64.asm
 	@ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > loader_disasm32.asm