Fix merge conflict

Control/CalypsoExample/Digitization/scripts/faser_digi.py

...l/CalypsoExample/Digitization/scripts/faser_digi_merge.py

.../CalypsoExample/Digitization/scripts/submit_faser_digi.sh

...soExample/Digitization/scripts/submit_faser_digi_merge.sh

...psoExample/Generation/scripts/submit_faser_particlegun.sh

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

...alypsoExample/Reconstruction/scripts/submit_faser_reco.sh

Control/CalypsoExample/Simulation/scripts/faser_simulate.py

...alypsoExample/Simulation/scripts/submit_faser_simulate.sh

PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py

...nalysis/NtupleDumper/scripts/submit_faser_ntuple_maker.sh