Star of the first part of the starformation law that checks density and temperature

src/starformation/schaye08/starformation.h

@@ -79,7 +79,6 @@ struct star_formation {
  * @brief Calculate if the gas has the potential of becoming
  * a star.
  *
-<<<<<<< HEAD
  * @param starform the star formation law properties to use.
  * @param p the gas particles
  * @param xp the additional properties of the gas particles
@@ -133,18 +132,11 @@ static int starformation_potential_to_become_star(
   } else {
     return 0;
   }
-=======
- *
- * */
-static int starformation_potential_to_become_star(
-    ){
-  return 0;
 }
 
 /*
  * @brief Calculate if the gas particle is converted 
  *
-<<<<<<< HEAD
  * @param starform the star formation struct
  * @param p the gas particles with their properties
  * @param xp the additional gas particle properties