diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 4d54cb7ac..bf4e85543 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,11 +31,7 @@
 #include <sys/time.h>
 #endif
 
-<<<<<<< HEAD
-#define BACKEND_VER "20200510"
-=======
 #define BACKEND_VER "20200511"
->>>>>>> 3b2225e4891cf4420814b19c214b8c64e174539d
 
 /*
  * defines used by comp_cal_str in rig.c