Fix CI failures

- Include the rgba image in the teardown of TestForeign.
- Fix merge conflict.

configure.ac

@@ -2,11 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-<<<<<<< HEAD
 AC_INIT([vips], [8.11.0], [vipsip@jiscmail.ac.uk])
-=======
-AC_INIT([vips], [8.10.7], [vipsip@jiscmail.ac.uk])
->>>>>>> 8.10
 # required for gobject-introspection
 AC_PREREQ(2.62)
 

test/test-suite/test_foreign.py

@@ -44,6 +44,7 @@ class TestForeign:
     def teardown_class(cls):
         shutil.rmtree(cls.tempdir, ignore_errors=True)
         cls.colour = None
+        cls.rgba = None
         cls.mono = None
         cls.rad = None
         cls.cmyk = None