diff --git a/{{cookiecutter.app_name}}/Pipfile b/{{cookiecutter.app_name}}/Pipfile
index 26eb0ba..c813b7b 100644
--- a/{{cookiecutter.app_name}}/Pipfile
+++ b/{{cookiecutter.app_name}}/Pipfile
@@ -49,12 +49,8 @@ environs = "==4.1.3"
 # Testing
 pytest = "==4.5.0"
 WebTest = "==2.0.33"
-<<<<<<< HEAD
 factory-boy = "==2.12.*"
-=======
-factory-boy = "==2.11.*"
 pdbpp = "==0.10.0"
->>>>>>> ae5c375... Implement docker environment
 
 # Lint and code style
 flake8 = "==3.7.7"