diff --git a/requirements.txt b/requirements.txt
index a36d129c..19d3e6ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,9 +8,4 @@ Flask-SQLAlchemy
 Flask-Table
 Flask-WTF
 jsonpatch
-<<<<<<< HEAD
-psycopg2
-python-dotenv
-=======
->>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
 redis