diff --git a/Robot2016/src/Shooter.h b/Robot2016/src/Shooter.h
index d8bf4bc..0b9d9ee 100644
--- a/Robot2016/src/Shooter.h
+++ b/Robot2016/src/Shooter.h
@@ -64,51 +64,28 @@ public:
 
 	void LowerRamp()
 	{
-<<<<<<< HEAD
-		launch_spinny->Set(-0.5);
-		if(launch_spinny->Limits::kReverseLimit){
+		ramp->Set(-0.5);
+		if(ramp->Limits::kReverseLimit){
 			SmartDashboard::PutNumber("ramp", 2); //going to put a circlar dial to show where the ramp could be
 		} else {
 			SmartDashboard::PutNumber("ramp", 1);
 		}
-
-=======
-		ramp->Set(-.5);
->>>>>>> arms
 	}
 
 	void RaiseRamp()
 	{
-<<<<<<< HEAD
-		launch_spinny->Set(0.5);
-		if(launch_spinny->Limits::kForwardLimit){
+		ramp->Set(0.5);
+		if(ramp->Limits::kForwardLimit){
 			SmartDashboard::PutNumber("ramp", 0); //going to put a circlar dial to show where the ramp could be
 		} else {
 			SmartDashboard::PutNumber("ramp", 1);
 		}
-=======
-		ramp->Set(0.5);
->>>>>>> arms
 	}
 
 	void StopRamp()
 	{
 		ramp->Set(0);
 	}
-<<<<<<< HEAD
-
-	void BoostRamp()
-	{
-		launch_spinny->Set(1);
-		if(launch_spinny->Limits::kForwardLimit){
-			SmartDashboard::PutNumber("ramp", 0); //going to put a circlar dial to show where the ramp could be
-		} else {
-			SmartDashboard::PutNumber("ramp", 1);
-		}
-	}
-	
-=======
->>>>>>> arms
 	void Shoot()
 	{
 	// TODO: Shooter Logic should go as follows:
@@ -123,15 +100,9 @@ public:
 			case READY:
 			{
 				state = SPINNINGUP;
-<<<<<<< HEAD
-				launch_spinny->Set(-1);
-				launcher->Set(LAUNCH_POWER);
-				pickup->Set(LAUNCH_POWER);
-=======
 				ramp->Set(-1);
 				launcher->Set(PICKUP_POWER);
 				pickup->Set(PICKUP_POWER);
->>>>>>> arms
 				shotClock.Reset();
 				shotClock.Start();
 				break;
@@ -151,11 +122,7 @@ public:
 			}
 			case LAUNCH:
 			{
-<<<<<<< HEAD
-				launch_spinny->Set(LAUNCH_POWER);
-=======
 				ramp->Set(1);
->>>>>>> arms
 				state = LAUNCHING;
 				break;
 			}
@@ -170,7 +137,7 @@ public:
 			}
 			case RESETTING:
 			{
-				launch_spinny->Set(0);
+				ramp->Set(0);
 				launcher->Set(0);
 				pickup->Set(0);
 				state = READY;