diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 5e1539479..7b49b8b5d 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -423,14 +423,6 @@ void WLED::setup()
 #ifdef WLED_ENABLE_DMX //reserve GPIO2 as hardcoded DMX pin
   PinManager::allocatePin(2, true, PinOwner::DMX);
 #endif
-<<<<<<< HEAD
-#ifdef WLED_ENABLE_DMX_INPUT
-  if(dmxInputTransmitPin > 0) PinManager::allocatePin(dmxInputTransmitPin, true, PinOwner::DMX);
-  if(dmxInputReceivePin > 0) PinManager::allocatePin(dmxInputReceivePin, true, PinOwner::DMX);
-  if(dmxInputEnablePin > 0) PinManager::allocatePin(dmxInputEnablePin, true, PinOwner::DMX);
-#endif
-=======
->>>>>>> a516a7b8 (Move dmx_input pin allocations from wled.cpp to dmx.cpp)
 
   DEBUG_PRINTLN(F("Registering usermods ..."));
   registerUsermods();