Fixed merge conflict

Author: allmightyspiff

tools/requirements.txt

@@ -3,7 +3,7 @@ click == 8.1.8
 requests >= 2.32.5
 prompt_toolkit >= 3.0.52
 pygments >= 2.20.0
-urllib3 >= 1.24
+urllib3 >= 2.6.3
 rich == 15.0.0
 # only used for soap transport
 # softlayer-zeep >= 5.0.0

tools/test-requirements.txt

@@ -8,7 +8,7 @@ click == 8.1.8
 requests >= 2.32.5
 prompt_toolkit >= 3.0.52
 pygments >= 2.20.0
-urllib3 >= 1.24
+urllib3 >= 2.6.3
 rich >= 12.3.0
 flake8
 autopep8