diff --git a/requirements.txt b/requirements.txt
index d8af0de..ba15039 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,10 +5,7 @@ pypdf2==2.12.1
 alive-progress
 requests
 git+https://github.com/Byeongdulee/python-urx.git
-<<<<<<< HEAD
-=======
 psycopg2
->>>>>>> dthomas-db
 pyyaml
 Flask
 selenium