diff --git a/ckan/config/environment.py b/ckan/config/environment.py
index f6ccee335e7..04e03f270db 100644
--- a/ckan/config/environment.py
+++ b/ckan/config/environment.py
@@ -104,14 +104,10 @@ def find_controller(self, controller):
 
     app_globals.reset()
 
-<<<<<<< HEAD
-=======
     # Build JavaScript translations. Must be done after plugins have
     # been loaded.
     build_js_translations()
 
->>>>>>> refs/remotes/ckan/master
-
 # A mapping of config settings that can be overridden by env vars.
 # Note: Do not remove the following lines, they are used in the docs
 # Start CONFIG_FROM_ENV_VARS
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 30904382225..720012cfc03 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -6,13 +6,8 @@ docutils==0.12
 factory-boy==2.1.1
 httpretty==0.8.3
 mock==2.0.0
-<<<<<<< HEAD
 pycodestyle==2.2.0
-pip-tools==1.6.5
-=======
-pep8==1.4.6
 pip-tools==1.7.0
->>>>>>> refs/remotes/ckan/master
 polib==1.0.7
 pyfakefs==2.9
 Sphinx==1.2.3