diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index c68e5008667..0954641e2a8 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -550,8 +550,5 @@ def auto_log_message(context):
         return _('Edited settings.')
     return ''
 
-<<<<<<< Updated upstream
 def content_span(body_class):
     return body_class.__str__()
-=======
->>>>>>> Stashed changes