diff --git a/esphome/components/seeedmultichannelrelay/switch/__init__.py b/esphome/components/seeedmultichannelrelay/switch/__init__.py
index 09f141c198..d29a040851 100644
--- a/esphome/components/seeedmultichannelrelay/switch/__init__.py
+++ b/esphome/components/seeedmultichannelrelay/switch/__init__.py
@@ -17,18 +17,6 @@ SeeedMultiChannelRelaySwitch = seeedmultichannelrelay_ns.class_(
 
 CONF_INTERLOCK_WAIT_TIME = "interlock_wait_time"
 
-<<<<<<< HEAD
-=======
-CONF_Relay_1 = 1
-CONF_Relay_2 = 2
-CONF_Relay_3 = 3
-CONF_Relay_4 = 4
-CONF_Relay_5 = 5
-CONF_Relay_6 = 6
-CONF_Relay_7 = 7
-CONF_Relay_8 = 8
-
->>>>>>> 50580e13d9408947ba9253f034cae2466b2703d5
 RelayBit_ = seeedmultichannelrelay_ns.enum("RelayBit", is_class=True)
 
 CONFIG_SCHEMA = (
diff --git a/esphome/components/seeedmultichannelrelay/switch/seeedmultichannelrelay_switch.cpp b/esphome/components/seeedmultichannelrelay/switch/seeedmultichannelrelay_switch.cpp
index 171850f851..f1747e1fa1 100644
--- a/esphome/components/seeedmultichannelrelay/switch/seeedmultichannelrelay_switch.cpp
+++ b/esphome/components/seeedmultichannelrelay/switch/seeedmultichannelrelay_switch.cpp
@@ -63,11 +63,7 @@ void SeeedMultiChannelRelaySwitch::write_state(bool state) {
   }
 
   // This will be called every time the user requests a state change.
-<<<<<<< HEAD
   this->parent_->relay_write(this->channel_-1, state);
-=======
-  this->parent_->relay_write(this->channel_, state);
->>>>>>> 50580e13d9408947ba9253f034cae2466b2703d5
 
   // Acknowledge new state by publishing it
   this->publish_state(state);