diff --git a/code/platformio.ini b/code/platformio.ini
index 482b060c..a3018e64 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -2426,7 +2426,6 @@ upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
 modules = ${common.modules} sensor
 
-<<<<<<< HEAD
 [env:blitzwolf-bwshp2]
 platform = ${common.platform}
 framework = arduino