diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c
index 03810c5..b59cb25 100644
--- a/kaleid/kernel/init/init.c
+++ b/kaleid/kernel/init/init.c
@@ -38,11 +38,9 @@
 #include <io/pci.h>
 #include <po/shtdwn.h>
 #include <init/boot.h>
-<<<<<<< HEAD
 #include <io/pci.h>
 #include <drivers/rtl8139.h>
-=======
->>>>>>> master
+
 
 //
 // Entry point of the Kaleid kernel