diff --git a/platformio.ini b/platformio.ini
index 3dbfcb9..79761e3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,7 +18,11 @@ monitor_filters = esp8266_exception_decoder, default, time, printable, colorize
 board_build.ldscript = eagle.flash.4m.ld	; 4MB (FS:4MB OTA:~3600KB)
 upload_speed = 921600
 
+<<<<<<< HEAD
 custom_prog_version = 1.1.4-IP65-v2
+=======
+custom_prog_version = 1.1.5A4
+>>>>>>> e8fbd3f243bcadc805e7e09000e02feb4b25535d
 
 build_flags = 
 			-DVERSION=${this.custom_prog_version}
@@ -33,6 +37,6 @@ lib_deps =
 	esphome/ESPAsyncTCP-esphome@^2.0.0
 	esphome/ESPAsyncWebServer-esphome@^3.1.0
 	alanswx/ESPAsyncWiFiManager@^0.31
+	plerup/EspSoftwareSerial @ ^8.2.0
 	https://github.com/dok-net/ghostl
-	plerup/EspSoftwareSerial@^8.2.0 
 	asjdf/WebSerialLite@^2.2.0