diff --git a/tests/x.py b/tests/x.py
index f7af7be525..fce4b4f3ec 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,10 +148,8 @@ 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"]:
+        for version in ["14_client_ssl", "13_client_ssl", "12_client_ssl", "11_client_ssl", "10_client_ssl"]:
             run(
                 f"cargo test --no-default-features --features macros,offline,any,all-types,postgres,runtime-{runtime}-{tls}",
                 comment=f"test postgres {version} no-password",
@@ -174,7 +171,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
             )
 
         ## +client-ssl
-        for version in ["8_client_ssl", "5_7_client_ssl", "5_6_client_ssl"]:
+        for version in ["8_client_ssl", "5_7_client_ssl"]:
             run(
                 f"cargo test --no-default-features --features macros,offline,any,all-types,mysql,runtime-{runtime}-{tls}",
                 comment=f"test mysql {version} no-password",
@@ -187,7 +184,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
         # mariadb
         #
 
-        for version in ["10_6", "10_5", "10_4", "10_3", "10_2"]:
+        for version in ["10_6", "10_5", "10_4", "10_3"]:
             run(
                 f"cargo test --no-default-features --features macros,offline,any,all-types,mysql,runtime-{runtime}-{tls}",
                 comment=f"test mariadb {version}",
@@ -196,7 +193,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
             )
 
         ## +client-ssl
-        for version in ["10_6_client_ssl", "10_5_client_ssl", "10_4_client_ssl", "10_3_client_ssl", "10_2_client_ssl"]:
+        for version in ["10_6_client_ssl", "10_5_client_ssl", "10_4_client_ssl", "10_3_client_ssl"]:
             run(
                 f"cargo test --no-default-features --features macros,offline,any,all-types,mysql,runtime-{runtime}-{tls}",
                 comment=f"test mariadb {version} no-password",