diff --git a/development.txt b/development.txt
index fad94d07b..3e68948da 100644
--- a/development.txt
+++ b/development.txt
@@ -1 +1,5 @@
-django-discover-runner>=0.2.2
\ No newline at end of file
+<<<<<<< HEAD
+django-discover-runner>=0.2.2
+=======
+coverage
+>>>>>>> tests_refactoring