diff --git a/tasmota/xdrv_39_thermostat.ino b/tasmota/xdrv_39_thermostat.ino
index 01545aaa3..d822a0564 100644
--- a/tasmota/xdrv_39_thermostat.ino
+++ b/tasmota/xdrv_39_thermostat.ino
@@ -502,15 +502,7 @@ void ThermostatCalculatePI()
     }
   } 
   // If target value has not been reached
-<<<<<<< HEAD
-<<<<<<< HEAD
   // AND we are within the histeresis
-=======
-  // AND we are withinvr the histeresis
->>>>>>> new_branch_dev
-=======
-  // AND we are withinvr the histeresis
->>>>>>> new_branch_dev
   // AND gradient is positive
   // then set value to 0
   else if ((Thermostat.temp_pi_error > 0)