resolve merge conflicts

setup.py

@@ -34,7 +34,7 @@ def find_package_data(package):
 
 setuptools.setup(
     name="brozzler",
-    version="1.5.59b0",
+    version="1.6.4",
     description="Distributed web crawling with browsers",
     url="https://github.com/internetarchive/brozzler",
     author="Noah Levitt",
@@ -72,8 +72,6 @@ setuptools.setup(
         "websocket-client==1.8.0",
         "pillow>=5.2.0",
         "urlcanon>=0.1.dev23",
-        "doublethink @ git+https://github.com/internetarchive/doublethink.git@Py311",
-        "rethinkdb==2.4.9",
         "cerberus>=1.0.1",
         "jinja2>=2.10",
         "cryptography>=2.3",
@@ -88,6 +86,8 @@ setuptools.setup(
             "pywb>=0.33.2,<2",
             "flask>=1.0",
             "gunicorn>=19.8.1",
+            "rethinkdb==2.4.9",
+            "doublethink==0.4.9",
         ],
     },
     zip_safe=False,
@@ -95,9 +95,7 @@ setuptools.setup(
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: System :: Archiving",
     ],