Fixed merge conflict

Author: allmightyspiff

tools/requirements.txt

@@ -2,7 +2,7 @@
 click == 8.1.8
 requests >= 2.32.5
 prompt_toolkit >= 3.0.52
-pygments >= 2.0.0
+pygments >= 2.20.0
 urllib3 >= 1.24
 rich == 15.0.0
 # only used for soap transport

tools/test-requirements.txt

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