diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index 43dd7b776d9b972956872f966eddf0059c50f520..3176de34267cdb5e3214d255dd6dfead20df8e46 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -30,10 +30,6 @@ void mcbm_transport(Int_t nEvents = 10,
                     //                  const char* setupName = "mcbm_beam_2022_02",
                     //                  const char* setupName = "mcbm_beam_2022_01",
                     const char* setupName = "mcbm_beam_2024_03_22_gold",
-<<<<<<< HEAD
-                    //                  const char* setupName = "mcbm_beam_2023_00_much_out_sts_downstream",
-=======
->>>>>>> 7db1a6be4 (Fix mcbm_transport.C parameters)
                     //                  const char* setupName = "mcbm_beam_2022_06_16_gold",
                     //                  const char* setupName = "mcbm_beam_2022_05_23_nickel",
                     //                  const char* setupName = "mcbm_beam_2022_03_28_uranium",