diff --git a/swift.c b/swift.c
index 822313ff16d04f8c1427e52fd529cb0d55baae51..7566e6ab8c6bc8538fab22643891d42dd6b3c8e3 100644
--- a/swift.c
+++ b/swift.c
@@ -1358,7 +1358,6 @@ int main(int argc, char *argv[]) {
 
     /* Initialize the space with these data. */
     if (myrank == 0) clocks_gettime(&tic);
-<<<<<<< HEAD:examples/main.c
     space_init(&s, params, &cosmo, dim, &hydro_properties, &gravity_properties,
                parts, gparts, sinks, sparts, bparts, Ngas, Ngpart, Nsink,
                Nspart, Nbpart, Nnupart, periodic, replicate, remap_ids,
@@ -1367,15 +1366,6 @@ int main(int argc, char *argv[]) {
                with_DM_background_particles,
                with_neutrinos, talking, dry_run, nr_nodes);
 
-=======
-    space_init(&s, params, &cosmo, dim, &hydro_properties, parts, gparts, sinks,
-               sparts, bparts, Ngas, Ngpart, Nsink, Nspart, Nbpart, Nnupart,
-               periodic, replicate, remap_ids, generate_gas_in_ics, with_hydro,
-               with_self_gravity, with_star_formation, with_sinks,
-               with_DM_particles, with_DM_background_particles, with_neutrinos,
-               talking, dry_run, nr_nodes);
->>>>>>> master:swift.c
-
     /* Initialise the line of sight properties. */
     if (with_line_of_sight) los_init(s.dim, &los_properties, params);