diff --git a/lms/envs/common.py b/lms/envs/common.py
index 9654031e95..85918c7c33 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -359,10 +359,7 @@ MIDDLEWARE_CLASSES = (
 
     'course_wiki.course_nav.Middleware',
 
-<<<<<<< HEAD
     'django.middleware.transaction.TransactionMiddleware',
-=======
->>>>>>> remove (almost) all references to askbot.
     # 'debug_toolbar.middleware.DebugToolbarMiddleware',
 
     'django_comment_client.utils.ViewNameMiddleware',