diff --git a/MicroPython_BUILD/firmware/esp32/MicroPython.bin b/MicroPython_BUILD/firmware/esp32/MicroPython.bin
index 480276d..eff31fd 100644
Binary files a/MicroPython_BUILD/firmware/esp32/MicroPython.bin and b/MicroPython_BUILD/firmware/esp32/MicroPython.bin differ
diff --git a/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin b/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin
index e5f1ab0..a525d35 100644
Binary files a/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin and b/MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin differ
diff --git a/MicroPython_BUILD/firmware/esp32/firmware.bin b/MicroPython_BUILD/firmware/esp32/firmware.bin
index 5cae4c3..49b8af6 100644
Binary files a/MicroPython_BUILD/firmware/esp32/firmware.bin and b/MicroPython_BUILD/firmware/esp32/firmware.bin differ
diff --git a/MicroPython_BUILD/firmware/esp32/partitions_mpy.csv b/MicroPython_BUILD/firmware/esp32/partitions_mpy.csv
index 2a952cd..1f782a7 100644
--- a/MicroPython_BUILD/firmware/esp32/partitions_mpy.csv
+++ b/MicroPython_BUILD/firmware/esp32/partitions_mpy.csv
@@ -5,10 +5,5 @@
 # -------------------------------------------------------
 nvs,            data, nvs,     0x9000,  24K,
 phy_init,       data, phy,     0xf000,  4K,
-<<<<<<< HEAD
 MicroPython,    app,  factory, 0x10000, 1664K,
 internalfs,     data, spiffs,  ,        2368K,
-=======
-MicroPython,    app,  factory, 0x10000, 1408K,
-internalfs,     data, spiffs,  ,        1024K,
->>>>>>> master
diff --git a/MicroPython_BUILD/firmware/esp32/sdkconfig b/MicroPython_BUILD/firmware/esp32/sdkconfig
index 351e1ba..ce32254 100644
--- a/MicroPython_BUILD/firmware/esp32/sdkconfig
+++ b/MicroPython_BUILD/firmware/esp32/sdkconfig
@@ -19,14 +19,9 @@ CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
 CONFIG_LOG_BOOTLOADER_LEVEL_INFO=
 CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
 CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
-<<<<<<< HEAD
 CONFIG_LOG_BOOTLOADER_LEVEL=2
-CONFIG_BOOTLOADER_VDDSDIO_BOOST=y
-=======
-CONFIG_LOG_BOOTLOADER_LEVEL=3
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
->>>>>>> master
 
 #
 # Security features
@@ -84,7 +79,7 @@ CONFIG_MONITOR_BAUD=115200
 #
 CONFIG_MICROPY_HW_BOARD_NAME="M5Stack"
 CONFIG_MICROPY_HW_MCU_NAME="ESP32"
-CONFIG_MICROPY_TIMEZONE="GMT0BST"
+CONFIG_MICROPY_TIMEZONE="UTC+8"
 CONFIG_MICROPY_USE_OTA=
 CONFIG_BOOT_SET_LED=-1