diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index b7fb6d54bc93134c00a9a62c80381c5d66a7d435..45d35002e408299c35098d0002bfe93d0627e125 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -356,7 +356,6 @@ if dumpTrtInfo:
     topSequence += InDetPRD_Association
     print InDetPRD_Association
 
->>>>>>> 6627d0e4f2... Merge branch '21.0-TRTxAODUpdates' into '21.0'
 if dumpSctInfo:
     from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import SCT_PrepDataToxAOD
     xAOD_SCT_PrepDataToxAOD = SCT_PrepDataToxAOD( name = "xAOD_SCT_PrepDataToxAOD")