diff --git a/lms/envs/common.py b/lms/envs/common.py
index 9948a33ed5..3330bf0ce3 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -338,12 +338,6 @@ TEMPLATE_LOADERS = (
 
     # 'django.template.loaders.filesystem.Loader',
     # 'django.template.loaders.app_directories.Loader',
-<<<<<<< HEAD
-    
-=======
-
-    #'askbot.skins.loaders.filesystem_load_template_source',
->>>>>>> origin/master
     # 'django.template.loaders.eggs.Loader',
 )