diff --git a/src/irmc.c b/src/irmc.c
index cf312ec..0e0f1dc 100644
--- a/src/irmc.c
+++ b/src/irmc.c
@@ -31,10 +31,7 @@
 #include <mach/mach.h>
 #endif
  
-<<<<<<< HEAD:irmc.c
-=======
 #define DEBUG 0
->>>>>>> master:src/irmc.c
 
 #define MAXDATASIZE 1024 // max number of bytes we can get at once