Fix merge conflicts in packages/web_apps/setup.cfg

packages/web_apps/setup.cfg

@@ -9,7 +9,6 @@ classifiers =
     Natural Language :: English
     Operating System :: POSIX
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
@@ -36,16 +35,17 @@ install_requires =
     galaxy-data
     galaxy-job-execution
     galaxy-tool-util
-    galaxy-util
+    galaxy-util[jstree,template]
     galaxy-web-framework
+    galaxy-web-stack
     a2wsgi
     apispec
     Babel
-    Cheetah3
+    Cheetah3!=3.2.6.post2
     fastapi>=0.101.0
     gunicorn
     gxformat2
-    importlib_resources
+    importlib-resources;python_version<'3.9'
     Mako
     MarkupSafe
     mercurial
@@ -68,7 +68,7 @@ install_requires =
     WebOb
     Whoosh
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.8
 
 [options.packages.find]
 exclude =