Er í miklu veseni með git en held ég sé búinn að redda þessu, nýjasta útgáfa af part2

src/main.cpp

@@ -52,8 +52,7 @@ int main()
     motor.begin();
 
     sei();
-
-
+    
     // motor_controller.set_states(
     //     &initialization_state,
     //     &operational_state,

src/motor_controller.cpp

@@ -120,6 +120,20 @@ 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);
@@ -129,6 +143,7 @@ bool MotorController::fault_active()
 {
     return motor.fault_active();
 }
+<<<<<<< HEAD
 
 void MotorController::led_on()
 {
@@ -140,3 +155,5 @@ void MotorController::led_off()
 {
    led.set_lo();
 }
+=======
+>>>>>>> 1d93605cc37a81ea974c12e62c082be19acdb715