diff --git a/sbmy_control/main.py b/sbmy_control/main.py
index 8bb7ff0..350c97d 100644
--- a/sbmy_control/main.py
+++ b/sbmy_control/main.py
@@ -133,10 +133,17 @@ def main(parsed_args):
 
         case "allsCOLA":
             print_message(f"Running ICs, pre_sCOLA, sCOLA and post_sCOLA.", 1, "control", verbose=parsed_args.verbose)
+<<<<<<< HEAD:main.py
+            from parameters_card import parse_arguments_card, main_parameter_card
+            from timestepping import main_timestepping
+            from ICs import main_ICs
+            from scola import main_scola, main_pre_scola, main_post_scola, have_all_tiles
+=======
             from .parameters_card import parse_arguments_card, main_parameter_card
             from .timestepping import main_timestepping
             from .ICs import main_ICs
             from .scola import main_scola, main_pre_scola, main_post_scola, have_all_tiles
+>>>>>>> main:sbmy_control/main.py
 
             card_dict = main_parameter_card(parsed_args)
 
diff --git a/sbmy_control/parameters_card.py b/sbmy_control/parameters_card.py
index 5384adb..7381759 100644
--- a/sbmy_control/parameters_card.py
+++ b/sbmy_control/parameters_card.py
@@ -47,6 +47,7 @@ def register_arguments_card(parser:ArgumentParser):
     parser.add_argument("--OutputFCsDensity", type=str, default=None, help="Output FCs density file.")
     parser.add_argument("--OutputFCsSnapshot", type=str, default=None, help="Output FCs snapshot file.")
     parser.add_argument("--OutputRngStateLPT", type=str, default=None, help="Output RNG state file.")
+<<<<<<< HEAD:parameters_card.py
     ## Tests with phiBCs and density
     parser.add_argument("--WriteGravPot", type=bool, default=False, help="Write gravitational potential.")
     parser.add_argument("--OutputGravitationalPotentialBase", type=str, default=None, help="Output gravitational potential base.")
@@ -56,10 +57,12 @@ def register_arguments_card(parser:ArgumentParser):
     parser.add_argument("--MeshDensity", type=int, default=None, help="Mesh for density.")
     parser.add_argument("--LoadPhiBCs", type=bool, default=False, help="Load phiBCs.")
     parser.add_argument("--InputPhiBCsBase", type=str, default=None, help="Input phiBCs file base.")
+=======
     parser.add_argument("--WriteReferenceFrame", type=bool, default=False, help="Write reference frame (COCA).")
     parser.add_argument("--OutputMomentaBase", type=str, default=None, help="Output momenta base (COCA).")
     parser.add_argument("--ReadReferenceFrame", type=bool, default=False, help="Read reference frame (COCA).")
     parser.add_argument("--InputMomentaBase", type=str, default=None, help="Read momenta base (COCA).")
+>>>>>>> main:sbmy_control/parameters_card.py
 
 
 def register_arguments_card_for_ICs(parser:ArgumentParser):
@@ -230,6 +233,7 @@ def parse_arguments_card(parsed_args):
         card_dict["OutputFCsSnapshot"] = main_dict["resultdir"]+"final_particles_"+main_dict["simname"]+".gadget3"
     if card_dict["OutputRngStateLPT"] is None:
         card_dict["OutputRngStateLPT"] = main_dict["workdir"]+"rng_state.h5"
+<<<<<<< HEAD:parameters_card.py
     ## Tests with phiBCs and density
     if card_dict["OutputGravitationalPotentialBase"] is None:
         card_dict["OutputGravitationalPotentialBase"] = main_dict["workdir"]+"gravpot_"+main_dict["simname"]
@@ -241,10 +245,12 @@ def parse_arguments_card(parsed_args):
         card_dict["MeshDensity"] = card_dict["N_PM_mesh"]
     if card_dict["InputPhiBCsBase"] is None:
         card_dict["InputPhiBCsBase"] = main_dict["workdir"]+"gravpot_tCOLA"
+=======
     if card_dict["OutputMomentaBase"] is None:
         card_dict["OutputMomentaBase"] = main_dict["workdir"]+"momenta_"+main_dict["simname"]+"_"
     if card_dict["InputMomentaBase"] is None:
         card_dict["InputMomentaBase"] = main_dict["workdir"]+"momenta_"+main_dict["simname"]+"_"
+>>>>>>> main:sbmy_control/parameters_card.py
     
     return card_dict
 
@@ -363,6 +369,7 @@ def create_parameter_card_dict(
                     OutputFCsDensity:str = 'fcs_density.h5',
                     OutputFCsSnapshot:str = 'fcs_particles.gadget3',
 
+<<<<<<< HEAD:parameters_card.py
                     ## Tests with phiBCs and density
                     WriteGravPot:bool = True,
                     OutputGravitationalPotentialBase:str = 'gravitational_potential.h5',
@@ -372,11 +379,13 @@ def create_parameter_card_dict(
                     MeshDensity:int = 128,
                     LoadPhiBCs:bool = False,
                     InputPhiBCsBase:str = 'gravitational_potential.h5',
+=======
                     ## COCA parameters
                     WriteReferenceFrame:bool = False,
                     OutputMomentaBase:str = 'momenta_',
                     ReadReferenceFrame:bool = False,
                     InputMomentaBase:str = 'momenta_',
+>>>>>>> main:sbmy_control/parameters_card.py
 
                     ## Cosmological parameters
                     h:float = 0.6732,