diff --git a/platformio.ini b/platformio.ini
index cca2c11f..c7522f70 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,10 +16,7 @@ env_default = generic
 ;env_default = ttgov21old
 ;env_default = ttgov21new
 ;env_default = ttgobeam
-<<<<<<< HEAD
-=======
 ;env_default = ttgofox
->>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
 ;env_default = lopy
 ;env_default = lopy4
 ;env_default = fipy
@@ -36,24 +33,16 @@ description = Paxcounter is a proof-of-concept ESP32 device for metering passeng
 release_version = 1.7.11
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
-<<<<<<< HEAD
-debug_level = 0
-=======
 debug_level = 3
->>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
 ; UPLOAD MODE: select esptool to flash via USB/UART, select custom to upload to cloud for OTA
 upload_protocol = esptool
 ;upload_protocol = custom
 extra_scripts = pre:build.py
 keyfile = ota.conf
 platform_espressif32 = espressif32@1.6.0
-<<<<<<< HEAD
-;platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage
-=======
->>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
 board_build.partitions = min_spiffs.csv
 monitor_speed = 115200
-lib_deps_lora = 
+lib_deps_lora =
     MCCI LoRaWAN LMIC library@^2.3.1
 lib_deps_display =
     U8g2@>=2.25.0
@@ -64,7 +53,7 @@ lib_deps_gps =
 lib_deps_basic =
     ArduinoJson@^5.13.1
     Time@>=1.5
-lib_deps_all = 
+lib_deps_all =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
@@ -92,10 +81,10 @@ framework = arduino
 board = esp32dev
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 115200
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -107,11 +96,11 @@ framework = arduino
 board = esp32dev
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 115200
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_rgbled}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -123,11 +112,11 @@ framework = arduino
 board = heltec_wifi_lora_32
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -139,11 +128,11 @@ framework = arduino
 board = heltec_wifi_lora_32
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -155,11 +144,11 @@ framework = arduino
 board = ttgo-lora32-v1
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 115200
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -171,11 +160,11 @@ framework = arduino
 board = ttgo-lora32-v1
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -187,11 +176,11 @@ framework = arduino
 board = esp32dev
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -203,47 +192,44 @@ framework = arduino
 board = esp32dev
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
 monitor_speed = ${common.monitor_speed}
 
-<<<<<<< HEAD
-=======
 [env:ttgofox]
 platform = ${common.platform_espressif32}
 framework = arduino
 board = esp32dev
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
 monitor_speed = ${common.monitor_speed}
 
->>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
 [env:ttgobeam]
 platform = ${common.platform_espressif32}
 framework = arduino
 board = ttgo-t-beam
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_gps}
 ;   ${common.lib_deps_display}
-build_flags = 
+build_flags =
     ${common.build_flags_all}
     -mfix-esp32-psram-cache-issue
 upload_protocol = ${common.upload_protocol}
@@ -256,11 +242,11 @@ framework = arduino
 board = esp32dev
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_rgbled}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -272,12 +258,12 @@ framework = arduino
 board = lopy
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_rgbled}
     ${common.lib_deps_gps}
-build_flags = 
+build_flags =
     ${common.build_flags_basic}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
@@ -307,7 +293,7 @@ framework = arduino
 board = lolin32
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_rgbled}
@@ -319,11 +305,11 @@ monitor_speed = ${common.monitor_speed}
 
 [env:lolin32lora]
 platform = ${common.platform_espressif32}
-framework = arduino 
+framework = arduino
 board = lolin32
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
     ${common.lib_deps_rgbled}
@@ -335,11 +321,11 @@ monitor_speed = ${common.monitor_speed}
 
 [env:lolin32lite]
 platform = ${common.platform_espressif32}
-framework = arduino 
+framework = arduino
 board = lolin32
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
-lib_deps = 
+lib_deps =
     ${common.lib_deps_basic}
     ${common.lib_deps_rgbled}
 build_flags =
@@ -362,7 +348,7 @@ monitor_speed = ${common.monitor_speed}
 
 [env:generic]
 platform = ${common.platform_espressif32}
-framework = arduino 
+framework = arduino
 board = esp32dev
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 921600
@@ -370,4 +356,4 @@ lib_deps = ${common.lib_deps_all}
 build_flags = ${common.build_flags_all}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
-monitor_speed = ${common.monitor_speed}
\ No newline at end of file
+monitor_speed = ${common.monitor_speed}