diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 94c9f671..37e08089 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -204,34 +204,14 @@ static inline uint32_t read_eflags(void)
  */
 uint32_t read_eip(void);
 
-<<<<<<< HEAD
-/// A one-instruction-do-nothing
-#define NOP1 	asm  volatile ("nop")
-/// Do nothing for 2 instructions
-#define NOP2  asm  volatile ("nop;nop")
-/// Do nothing for 4 instructions
-#define NOP4  asm  volatile ("nop;nop;nop;nop")
-/// Do nothing for 8 instructions
-#define NOP8  asm  volatile ("nop;nop;nop;nop;nop;nop;nop;nop")
 
-/** @brief Init several subsystems
- *
- * This function calls the initialization procedures for:
- * - SCC [if configured]
- * - GDT
- * - APIC
- * - PCI [if configured]
- *
- * @return 0 in any case
- */
-=======
 #define NOP1	asm volatile ("nop")
 #define NOP2	asm volatile ("nop;nop")
 #define NOP4	asm volatile ("nop;nop;nop;nop")
 #define NOP8	asm volatile ("nop;nop;nop;nop;nop;nop;nop;nop")
 #define HALT	asm volatile ("hlt");
 
->>>>>>> master
+
 inline static int system_init(void)
 {
 	gdt_install();