diff --git a/requirements.txt b/requirements.txt
index ddf3a336f..2c6044f73 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,11 +2,7 @@ cffi>=1.8
 cryptography>=1.4
 Django>=1.10
 django-debug-toolbar>=1.6
-<<<<<<< HEAD
-django-filter==0.15.3
-=======
 django-filter>=1.0.1
->>>>>>> develop
 django-mptt==0.8.7
 django-rest-swagger==0.3.10
 django-tables2>=1.2.5