Update pyproject.toml

pyproject.toml

@@ -63,20 +63,11 @@ dependencies = [
     "python-dateutil~=2.8.1",
     "pytz==2022.1",
     "rauth~=0.7.3",
-<<<<<<< HEAD
     "redis~=3.5.3",
     "hiredis~=2.0.0",
     "requests-oauthlib~=1.3.0",
-    "requests~=2.31.0",
-    "rq~=1.14.1",
-=======
-    "redis~=5.0.1",
-    "hiredis~=2.2.3",
-    "setproctitle~=1.3.3",
-    "requests-oauthlib~=1.3.1",
     "requests~=2.32.0",
-    "rq~=1.15.1",
->>>>>>> 1b025c76da (build: Bump requests (#26501))
+    "rq~=1.14.1",
     "rsa>=4.1",
     "semantic-version~=2.10.0",
     "sqlparse~=0.5.0",