   digitalWrite(RFM95_RST, HIGH);
 
   pinMode(controlPin, OUTPUT);
-<<<<<<< Updated upstream
-  pinMode(inputA, OUTPUT);
-  pinMode(inputB, OUTPUT);
-=======
   pinMode(statePinA, OUTPUT);
   pinMode(statePinB, OUTPUT);
->>>>>>> Stashed changes
 
   accel.begin();
   bmp.begin();
   gyro.enableAutoRange(true);
   gyro.begin();
   SD.begin(cardSelectPin);//Initialize the sensors and SD card
-<<<<<<< Updated upstream
-  
-  digitalWrite(controlPin, HIGH); //Enable servo
-  servoOnFlag = true;
-  digitalWrite(inputA, HIGH); //Set servo to "home" position
-  servoHomeFlag = true;
-=======
 
   digitalWrite(controlPin, LOW); //Set the servo control pin to low to make sure it doesn't pulse accidentally
->>>>>>> Stashed changes
 
   //Manual radio reset
   digitalWrite(RFM95_RST, LOW);

const int CENTER = 1;
const int RIGHT = 2;
int finPosition = CENTER; //Since the servo moves based on increments and not absolute positions, these constants and variable are needed to track the fins' position.
>>>>>>> Stashed changes

//Constants for flight staging
const int waiting = 0;

long flightTime = 0;

//Constants for servo pin output
const int controlPin = 0; //"control" is the pin which is pulsed to trigger the servo to move
const int statePinA = 1; //The state of pins A and B determines which of four motions the servo takes when the control pin is pulsed.
const int statePinB = 2; // If B is low, move 1 position, if B is high, move two positions. High A is negative (counterclockwise?), low A is positive (clockwise?)
