diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 270a8189a..409cc4f22 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -13,21 +13,12 @@ endif
 
 ifdef GCC83
 GCC82=1
-<<<<<<< HEAD
 endif
 
 ifdef GCC82
 GCC81=1
 endif
 
-=======
-endif
-
-ifdef GCC82
-GCC81=1
-endif
-
->>>>>>> srb2/next
 ifdef GCC81
 GCC72=1
 endif
@@ -235,13 +226,7 @@ ifdef GCC61
  WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
 endif
 ifdef GCC71
-<<<<<<< HEAD
- WFLAGS+=-Wno-error=implicit-fallthrough
- WFLAGS+=-Wno-implicit-fallthrough
- WFLAGS+=-Wno-format-truncation
-=======
  WFLAGS+=-Wimplicit-fallthrough=4
->>>>>>> srb2/next
 endif
 ifdef GCC81
  WFLAGS+=-Wno-error=format-overflow