diff --git a/Makefile b/Makefile
index e03c05e46..9e69493cc 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD)
 .PHONY: bootstrap
 bootstrap: ## Set up everything to run the app
 	make generate-version-file
-	pipenv install ---dev
+	pipenv install --dev
 	createdb notification_api || true
 	(pipenv run flask db upgrade) || true
 
diff --git a/Pipfile.lock b/Pipfile.lock
index 565227cdb..4c841e4d8 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,11 +1,7 @@
 {
     "_meta": {
         "hash": {
-<<<<<<< Updated upstream
-            "sha256": "eca9a39871c8db3e82fb384c39afc89fdc3c145c87653f5090927e578618ce11"
-=======
             "sha256": "ce99b649bae4b10b084aacc936b72e01957eb9354cbc420d684590133c2da004"
->>>>>>> Stashed changes
         },
         "pipfile-spec": 6,
         "requires": {
@@ -374,29 +370,10 @@
             "version": "==0.4.0"
         },
         "flask-sqlalchemy": {
-<<<<<<< Updated upstream
-=======
             "git": "https://github.com/pallets-eco/flask-sqlalchemy.git",
->>>>>>> Stashed changes
-            "hashes": [
-                "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912",
-                "sha256:f12c3d4cc5cc7fdcc148b9527ea05671718c3ea45d50c7e732cceb33f574b390"
-            ],
-<<<<<<< Updated upstream
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-=======
             "ref": "aa7a61a5357cf6f5dcc135d98c781192457aa6fa",
->>>>>>> Stashed changes
             "version": "==2.5.1"
         },
-        "flask-sqlalchemy==2-5-1": {
-            "git": "https://github.com/pallets-eco/flask-sqlalchemy.git",
-            "ref": "aa7a61a5357cf6f5dcc135d98c781192457aa6fa"
-        },
-        "flask-sqlalchemy==2.5.1": {
-            "git": "https://github.com/pallets-eco/flask-sqlalchemy.git",
-            "ref": "aa7a61a5357cf6f5dcc135d98c781192457aa6fa"
-        },
         "fqdn": {
             "hashes": [
                 "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f",
@@ -494,8 +471,6 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==1.1.3.post0"
         },
-<<<<<<< Updated upstream
-=======
         "gunicorn": {
             "extras": [
                 "eventlet"
@@ -504,15 +479,6 @@
             "ref": "1299ea9e967a61ae2edebe191082fd169b864c64",
             "version": "==20.1.0"
         },
->>>>>>> Stashed changes
-        "gunicorn[eventlet]==20-1-0": {
-            "git": "https://github.com/benoitc/gunicorn.git",
-            "ref": "1299ea9e967a61ae2edebe191082fd169b864c64"
-        },
-        "gunicorn[eventlet]==20.1.0": {
-            "git": "https://github.com/benoitc/gunicorn.git",
-            "ref": "1299ea9e967a61ae2edebe191082fd169b864c64"
-        },
         "idna": {
             "hashes": [
                 "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4",
@@ -755,11 +721,7 @@
         },
         "notifications-utils": {
             "git": "https://github.com/GSA/notifications-utils.git",
-<<<<<<< Updated upstream
-            "ref": "90c12da575f4e481452d4fcd2a594204b0c28249"
-=======
             "ref": "2cdffe3fa2417b61ce3d714dc5a2d67de6632bdd"
->>>>>>> Stashed changes
         },
         "orderedset": {
             "hashes": [
@@ -988,7 +950,7 @@
                 "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
                 "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==2.8.2"
         },
         "python-dotenv": {
@@ -1061,11 +1023,7 @@
                 "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983",
                 "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"
             ],
-<<<<<<< Updated upstream
-            "markers": "python_version >= '3.7' and python_full_version < '4.0.0'",
-=======
             "markers": "python_version >= '3.7' and python_version < '4'",
->>>>>>> Stashed changes
             "version": "==2.28.1"
         },
         "rfc3339-validator": {
@@ -1087,11 +1045,7 @@
                 "sha256:78f9a9bf4e7be0c5ded4583326e7461e3a3c5aae24073648b4bdfa797d78c9d2",
                 "sha256:9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9"
             ],
-<<<<<<< Updated upstream
-            "markers": "python_version >= '3.5' and python_full_version < '4.0.0'",
-=======
             "markers": "python_version >= '3.5' and python_version < '4'",
->>>>>>> Stashed changes
             "version": "==4.7.2"
         },
         "s3transfer": {
@@ -1160,7 +1114,7 @@
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
                 "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==1.16.0"
         },
         "smartypants": {
@@ -1246,11 +1200,7 @@
                 "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e",
                 "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"
             ],
-<<<<<<< Updated upstream
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_full_version < '4.0.0'",
-=======
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'",
->>>>>>> Stashed changes
             "version": "==1.26.12"
         },
         "vine": {
@@ -1362,19 +1312,11 @@
         },
         "zipp": {
             "hashes": [
-<<<<<<< Updated upstream
-                "sha256:3a7af91c3db40ec72dd9d154ae18e008c69efe8ca88dde4f9a731bb82fe2f9eb",
-                "sha256:972cfa31bc2fedd3fa838a51e9bc7e64b7fb725a8c00e7431554311f180e9980"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==3.9.0"
-=======
                 "sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1",
                 "sha256:7a7262fd930bd3e36c50b9a64897aec3fafff3dfdeec9623ae22b40e93f99bb8"
             ],
             "markers": "python_version >= '3.7'",
             "version": "==3.10.0"
->>>>>>> Stashed changes
         }
     },
     "develop": {
@@ -1814,7 +1756,7 @@
                 "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
                 "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==2.8.2"
         },
         "pytz": {
@@ -1864,11 +1806,7 @@
                 "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983",
                 "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"
             ],
-<<<<<<< Updated upstream
-            "markers": "python_version >= '3.7' and python_full_version < '4.0.0'",
-=======
             "markers": "python_version >= '3.7' and python_version < '4'",
->>>>>>> Stashed changes
             "version": "==2.28.1"
         },
         "requests-mock": {
@@ -1900,7 +1838,7 @@
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
                 "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==1.16.0"
         },
         "toml": {
@@ -1908,7 +1846,7 @@
                 "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                 "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==0.10.2"
         },
         "tomli": {
@@ -1931,11 +1869,7 @@
                 "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e",
                 "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"
             ],
-<<<<<<< Updated upstream
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_full_version < '4.0.0'",
-=======
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'",
->>>>>>> Stashed changes
             "version": "==1.26.12"
         },
         "werkzeug": {