2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 709e69b6..ff8a055b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -45,6 +45,8 @@ CHANGES FROM 3.0a TO 3.1
   search-backward use regular expressions by default; the incremental versions
   do not.
 
+* Turn off mouse mode 1003 as well as the rest when exiting.
+
 * Add selection_active format for when the selection is present but not moving
   with the cursor.
 
diff --git a/configure.ac b/configure.ac
index e29ebdc7..a835e104 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,10 @@
 # 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)