diff --git a/src/binary_c_structures.h b/src/binary_c_structures.h
index 9c8234e638a2d6e4fd1188a33155d385edd3606f..5ad82b1fe2595e20dd37ad96c8bf63d78d158011 100644
--- a/src/binary_c_structures.h
+++ b/src/binary_c_structures.h
@@ -1361,11 +1361,7 @@ struct star_t {
     
     double spiky_luminosity; // L modulated by pulse rise/fall
     double prev_tagb;
-<<<<<<< HEAD
-    double dmacc; /* mass of accreted layer */
-=======
     double dmacc; /* mass of accreted layer, used in NUCSYN and novae */
->>>>>>> izzard-discs
 #ifdef NUCSYN
     /* Nucleosynthesis stuff */
     /* stuff you might want to log */
@@ -1387,10 +1383,6 @@ struct star_t {
     double mixdepth,mixtime;
     double dmmix; /* mass of mixed region at the stellar surface */
     double conv_base; /* mass coord of surface convection zone (on MS) */
-<<<<<<< HEAD
-=======
-    
->>>>>>> izzard-discs
     double dm_companion_SN; /* mass change caused by companion supernova */
 
     double max_mix_depth;
diff --git a/src/nucsyn/nucsyn_remove_mass_from_surface.c b/src/nucsyn/nucsyn_remove_mass_from_surface.c
index 800a91338492fb1550721d3d9745f2689adffb3f..d5d4caaa62acb28ed71754d580f246f24c34bbfd 100644
--- a/src/nucsyn/nucsyn_remove_mass_from_surface.c
+++ b/src/nucsyn/nucsyn_remove_mass_from_surface.c
@@ -37,9 +37,4 @@ void nucsyn_remove_mass_from_surface(
         *allocated = FALSE;
     }
 }
-<<<<<<< HEAD
-
 #endif //NUCSYN
-=======
-#endif // NUCSYN
->>>>>>> izzard-discs