diff --git a/include/sim.h b/include/sim.h
index fe0ce63..9858ace 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -18,14 +18,11 @@ double const g = -9.81;
 
 bool sim(struct Vehicle &State, struct Vehicle &PrevState) {
 
-<<<<<<< HEAD
   // defining a few random values here cause I'm lazy
   State.burnElapsed = 2000;
   State.mass = State.massInitial;
   PrevState.thrust = 0.0;
-=======
   outVector stateVector;
->>>>>>> 3-store-data-in-memory
 
   // Determine when to burn
   burnStartTimeCalc(State);
@@ -41,11 +38,7 @@ bool sim(struct Vehicle &State, struct Vehicle &PrevState) {
     state2vec(State, stateVector, t);
 
     t++;
-<<<<<<< HEAD
   } while ((State.z > 0.0) || (State.thrust > 1.0));
-=======
-  } while ((State.z > 0) || (State.thrust > 1));
->>>>>>> 3-store-data-in-memory
 
   write2CSV(stateVector);