diff --git a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
index f137bc27ac570fd4d8a74a5007fd3c3c5ba20af8..3f28a5782da238b899812baad6a3dc13aa2b2853 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
@@ -32,9 +32,6 @@ parser.add_argument("-g", "--geom", default="",
 parser.add_argument("--outfile", default="",
                     help="Override output file name")
 
-parser.add_argument("-g", "--geom", default="",
-                    help="Specify geometry (if it can't be parsed from run number)\n Values: TI12Data03 (2022 TI12)")
-
 parser.add_argument("-v", "--verbose", action='store_true', 
                     help="Turn on DEBUG output")
 parser.add_argument("-n", "--nevents", type=int, default=-1,
@@ -293,28 +290,11 @@ else:
 
 configFlags.Input.ProjectName = "data21"                     # Needed to bypass autoconfig
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-configFlags.Common.isOnline = False
-configFlags.GeoModel.Align.Dynamic = False
-configFlags.Beam.NumberOfCollisions = 0.
-configFlags.Detector.GeometryFaserSCT = True
-configFlags.lock()
-=======
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
-ConfigFlags.Detector.GeometryFaserSCT = True
-ConfigFlags.lock()
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
-configFlags.GeoModel.FaserVersion   = "FASERNU-03"           # FASER geometry
 configFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
+#configFlags.GeoModel.Align.Dynamic = False
 configFlags.Beam.NumberOfCollisions = 0.
 configFlags.Detector.GeometryFaserSCT = True
 configFlags.lock()
->>>>>>> 6e1b4d4be8e (Configuration fixes)
 
 # Core components
 acc = MainServicesCfg(configFlags)