diff --git a/development.txt b/development.txt
index 3e68948da..bf33a76c2 100644
--- a/development.txt
+++ b/development.txt
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-django-discover-runner>=0.2.2
-=======
 coverage
->>>>>>> tests_refactoring
+django-discover-runner>=0.2.2