diff --git a/requirements.txt b/requirements.txt
index 043970d..63bf02d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+#<<<<<<< HEAD
 arrow==0.9.0
 decorator==4.0.10
 praw==4.2.0
@@ -10,7 +10,7 @@ tornado==4.3
 update-checker==0.15
 wheel==0.24.0
 appdirs==1.4.3
-=======
+#=======
 appdirs==1.4.3
 arrow==0.10.0
 backports-abc==0.5
@@ -27,4 +27,4 @@ six==1.10.0
 tornado==4.5.1
 update-checker==0.16
 urllib3==1.21.1
->>>>>>> 772df35c68a6782b2bd733801458023545977166
+#>>>>>>> 772df35c68a6782b2bd733801458023545977166