diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino
index bb3149f3..433e3610 100644
--- a/code/espurna/relay.ino
+++ b/code/espurna/relay.ino
@@ -457,13 +457,8 @@ void relaySetup() {
         if (relayMode == RELAY_MODE_OFF) relayStatus(i, false);
         if (relayMode == RELAY_MODE_ON) relayStatus(i, true);
     }
-<<<<<<< HEAD
-    if (relayMode == RELAY_MODE_SAME) relayRetrieve();
-=======
-
     if (relayMode == RELAY_MODE_SAME) relayRetrieve(false);
     if (relayMode == RELAY_MODE_TOOGLE) relayRetrieve(true);
->>>>>>> Enable revert state mode
 
     relaySetupAPI();
     relaySetupMQTT();