diff --git a/tests/x.py b/tests/x.py
index f7af7be525..8aa59c65d2 100755
--- a/tests/x.py
+++ b/tests/x.py
@@ -138,7 +138,6 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
                 tag=f"postgres_{version}" if runtime == "async-std" else f"postgres_{version}_{runtime}",
             )
 
-<<<<<<< HEAD
         ## +ssl
         for version in ["14", "13", "12", "11", "10"]:
             run(
@@ -149,8 +148,6 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
                 tag=f"postgres_{version}_ssl" if runtime == "async-std" else f"postgres_{version}_ssl_{runtime}",
             )
 
-=======
->>>>>>> c85c4d2b (Add client ssl tests for MariaDB and MySQL)
         ## +client-ssl
         for version in ["14_client_ssl", "13_client_ssl", "12_client_ssl", "11_client_ssl", "10_client_ssl", "9_6_client_ssl"]:
             run(