diff --git a/settings_new_askbot.py b/settings_new_askbot.py
index d4bcde0aee..702a0c4b2c 100644
--- a/settings_new_askbot.py
+++ b/settings_new_askbot.py
@@ -90,12 +90,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
-<<<<<<< local
-    'djangomako.middleware.MakoMiddleware',
-    'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
-=======
     'mitxmako.middleware.MakoMiddleware',
->>>>>>> other
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )