diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 5009a4e71c..88f4c3c48a 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -435,13 +435,8 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
 
     # cdodge: this is a list of metadata names which are 'system' metadata
     # and should not be edited by an end-user
-<<<<<<< HEAD
     system_metadata_fields = ['data_dir', 'published_date', 'published_by', 'is_draft']
-    
-=======
-    system_metadata_fields = [ 'data_dir' ]
 
->>>>>>> origin/master
     # A list of descriptor attributes that must be equal for the descriptors to
     # be equal
     equality_attributes = ('definition', 'metadata', 'location',