diff --git a/configure.ac b/configure.ac
index 779f0bc6..f5c2755c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-<<<<<<< HEAD
 AC_INIT([vips], [8.6.0], [vipsip@jiscmail.ac.uk])
-=======
-AC_INIT([vips], [8.5.5], [vipsip@jiscmail.ac.uk])
->>>>>>> 8.5
 # required for gobject-introspection
 AC_PREREQ(2.62)