diff --git a/src/settings.h b/src/settings.h
index dcd4e30..e033924 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -218,7 +218,6 @@
             constexpr const char topicBatteryVoltage[] PROGMEM = "State/ESPuino/Voltage";
         #endif
     #endif
-<<<<<<< HEAD
 
     // !!! MAKE SURE TO EDIT PLATFORM SPECIFIC settings-****.h !!!
     #if (HAL == 1)
@@ -237,6 +236,4 @@
         #include "settings-custom.h"                        // Contains all user-relevant settings custom-board
     #endif
 
-=======
->>>>>>> 15a06350b94ca27ba7d88401436a90da2c068d50
 #endif