diff --git a/requirements.txt b/requirements.txt
index 75d25c4..6f83e94 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-lxml
-beautifulsoup
-=======
 beautifulsoup4
 lxml
->>>>>>> origin/master