diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
index cb30af7901..2981ce9833 100644
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -159,11 +159,8 @@ class OpenEndedModuleTest(unittest.TestCase):
             'max_score': max_score,
             'display_name': 'Name',
             'accept_file_upload': False,
-<<<<<<< HEAD
             'rewrite_content_links' : "",
-=======
-            'close_date': None
->>>>>>> origin/master
+            'close_date': None,
             }
 
     oeparam = etree.XML('''