diff --git a/lib/treppe/treppe.cpp b/lib/treppe/treppe.cpp
index eee9b77..8aa7466 100644
--- a/lib/treppe/treppe.cpp
+++ b/lib/treppe/treppe.cpp
@@ -194,11 +194,7 @@ void Treppe::task(){
 
   last_sensor_state[0] = current_sensor_state[0];
   last_sensor_state[1] = current_sensor_state[1];
-<<<<<<< HEAD
   
-=======
-
->>>>>>> 3d13e761f497a0408c134059ff0dfadaa93ebbf4
   ledsequence();
 }