diff --git a/configure.ac b/configure.ac
index a835e104..e29ebdc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,6 @@
 # configure.ac
 
-<<<<<<< HEAD
 AC_INIT([tmux], next-3.2)
-=======
-AC_INIT([tmux], 3.1-rc3)
->>>>>>> 3.1-rc
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)