diff --git a/requirements.txt b/requirements.txt
index ab77748..85b1704 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,5 @@
 icalendar
 feedparser
 flask
-<<<<<<< HEAD
 flask_wtf
-=======
->>>>>>> 6f7d1bc591377e4541b7802bddb4a278611903a3
 requests