diff --git a/Trigger/TriggerRelease/python/Modifiers.py b/Trigger/TriggerRelease/python/Modifiers.py
index 9dc20bfb8a7c35299071626423c07b545506065f..8d63b6001288f2c87a9fe98960f5f0daa09cf42c 100644
--- a/Trigger/TriggerRelease/python/Modifiers.py
+++ b/Trigger/TriggerRelease/python/Modifiers.py
@@ -1409,11 +1409,8 @@ class doValidation(_modifier):
         
     def preSetup(self):
         TriggerFlags.Online.doValidation = True
-<<<<<<< HEAD
-=======
         # Replace Online with Validation monitoring
         TriggerFlags.enableMonitoring = filter(lambda x:x!='Online', TriggerFlags.enableMonitoring())+['Validation']
->>>>>>> origin/svn-sweep-2015-02-15
         for m in self.modifiers: m.preSetup()
         
     def postSetup(self):
@@ -1538,11 +1535,7 @@ class enableCostMonitoring(_modifier):
     Enable Cost Monitoring for online
     """
     def preSetup(self):
-<<<<<<< HEAD
-        TriggerFlags.enableMonitoring = TriggerFlags.enableMonitoring.get_Value()+['CostExecL2','CostExecEF','CostExecHLT']
-=======
         TriggerFlags.enableMonitoring = TriggerFlags.enableMonitoring.get_Value()+['CostExecHLT']
->>>>>>> origin/svn-sweep-2015-02-15
 
     def postSetup(self):
         from TrigCostMonitor.TrigCostMonitorConfig import postSetupOnlineCost
diff --git a/Trigger/TriggerRelease/share/runHLT_standalone.py b/Trigger/TriggerRelease/share/runHLT_standalone.py
index 996c56689b05822fcbbe82af1614d949afb6c306..b28fa51f869ced47d61437e3fbf6dbc7355b95e6 100755
--- a/Trigger/TriggerRelease/share/runHLT_standalone.py
+++ b/Trigger/TriggerRelease/share/runHLT_standalone.py
@@ -352,11 +352,7 @@ log.info("Trigger xml files HLT    : in = %s , out = %s (read from XML = %s)" %
 
 # define a unique HLT configuration xml when running in a partition
 import os
-<<<<<<< HEAD
-if os.environ.has_key("TDAQ_PARTITION"):
-=======
 if "TDAQ_PARTITION" in os.environ:
->>>>>>> origin/svn-sweep-2015-02-15
     from TriggerRelease import Utils
     ident = Utils.uniqueFileName()
     TriggerFlags.outputHLTconfigFile ="outputHLTconfig_%s.xml" % ident