diff --git a/src/motor_controller.cpp b/src/motor_controller.cpp
index 528f6b9..3efb811 100644
--- a/src/motor_controller.cpp
+++ b/src/motor_controller.cpp
@@ -120,20 +120,6 @@ void MotorController::reset_speed_measurement()
     encoder.reset_speed_measurement();
 }
 
-<<<<<<< HEAD
-=======
-
-void MotorController::led_on()
-{
-    led.set_hi();
-}
-
-
-void MotorController::led_off()
-{
-    led.set_lo();
-}
->>>>>>> 1d93605cc37a81ea974c12e62c082be19acdb715
 void MotorController::to_stopped()
 {
     transition_to(stopped_state);
@@ -143,7 +129,6 @@ bool MotorController::fault_active()
 {
     return motor.fault_active();
 }
-<<<<<<< HEAD
 
 void MotorController::led_on()
 {
@@ -155,5 +140,3 @@ void MotorController::led_off()
 {
    led.set_lo();
 }
-=======
->>>>>>> 1d93605cc37a81ea974c12e62c082be19acdb715