diff --git a/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py b/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
index ca5d3d5a0ee86486589e2e08fb130991b601f2d7..405ffe1369d94bc809a9c5287121af96bcc595d8 100644
--- a/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
+++ b/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
@@ -36,7 +36,6 @@ rec.doCaloRinger.set_Value_and_Lock(False)
 #Turn of TAG
 rec.doWriteTAG.set_Value_and_Lock(False)
 
-<<<<<<< Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
 #disables VertexCnvAlg
 from InDetRecExample.InDetJobProperties import jobproperties
 jobproperties.InDetJobProperties.doxAOD.set_Value_and_Lock(False)
@@ -51,7 +50,6 @@ CaloNoiseCondAlg(noisetype="electronicNoise")
 
 athenaCommonFlags.EvtMax=30
 #Run pflopw jet finding - this cannot be enabled via reconstruction flags currently! (without enabling other things we don't want)
->>>>>>> Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
 UserAlgs = ["eflowRec/jetAlgs.py"]
 include ("RecExCommon/RecExCommon_topOptions.py")