diff --git a/ports/nrf/boards/TG-Watch02A/mpconfigboard.h b/ports/nrf/boards/TG-Watch02A/mpconfigboard.h
index 788454fc3a..d499f58e53 100644
--- a/ports/nrf/boards/TG-Watch02A/mpconfigboard.h
+++ b/ports/nrf/boards/TG-Watch02A/mpconfigboard.h
@@ -27,21 +27,16 @@
 
 #include "nrfx/hal/nrf_gpio.h"
 
-<<<<<<< HEAD
-#define MICROPY_HW_BOARD_NAME       "TG-Techie's TG-Watch02A"
+
+#define MICROPY_HW_BOARD_NAME       "TG-Techie's TG-Watch02A Rev:00"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
 
-=======
-#define MICROPY_HW_BOARD_NAME       "TG-Watch02A-rev00"
-#define MICROPY_HW_MCU_NAME         "nRF52840"
+//#define FLASH_SIZE                  (0x100000)
+//#define FLASH_PAGE_SIZE             (4096)
 
-#define FLASH_SIZE                  (0x100000)
-#define FLASH_PAGE_SIZE             (4096)
-
->>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
 #define MICROPY_HW_NEOPIXEL         (&pin_P0_16)
 
-#define MICROPY_HW_LED_STATUS       (&pin_P1_15)
+#define MICROPY_HW_LED_STATUS       (&pin_P0_07)
 
 #if QSPI_FLASH_FILESYSTEM
 #define MICROPY_QSPI_DATA0                NRF_GPIO_PIN_MAP(0, 17)
@@ -59,15 +54,14 @@
 #define SPI_FLASH_CS_PIN &pin_P0_20
 #endif
 
-<<<<<<< HEAD
-=======
+/*
 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500
 
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
+*/
 
->>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
 #define BOARD_HAS_CRYSTAL 0
 
 #define DEFAULT_I2C_BUS_SCL         (&pin_P0_11)
diff --git a/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk b/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk
index 62010930a9..2629643071 100644
--- a/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk
+++ b/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk
@@ -1,6 +1,6 @@
 USB_VID = 0x239A
 USB_PID = 0x802A
-<<<<<<< HEAD
+
 USB_PRODUCT = "TG-Watch02A"
 USB_MANUFACTURER = "TG-Tech"
 
@@ -9,29 +9,29 @@ MCU_CHIP = nrf52840
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q128JV_SQ"
-=======
-USB_PRODUCT = "TG-Watch02"
-USB_MANUFACTURER = "TG-Tech
 
-MCU_SERIES = m4
-MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52840
-MCU_CHIP = nrf52840
-SD ?= s140
-SOFTDEV_VERSION ?= 6.1.0
 
-BOOT_SETTING_ADDR = 0xFF000
+#USB_PRODUCT = "TG-Watch02"
+#USB_MANUFACTURER = "TG-Tech
 
-ifeq ($(SD),)
-	LD_FILE = boards/nrf52840_1M_256k.ld
-else
-	LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
-	CIRCUITPY_BLEIO = 1
-endif
+#MCU_SERIES = m4
+#MCU_VARIANT = nrf52
+#MCU_SUB_VARIANT = nrf52840
+#MCU_CHIP = nrf52840
+#SD ?= s140
+#SOFTDEV_VERSION ?= 6.1.0
 
-NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
+#BOOT_SETTING_ADDR = 0xFF000
 
-QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICE_COUNT = 1
-EXTERNAL_FLASH_DEVICES = "GD25Q16C"
->>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
+#ifeq ($(SD),)
+#	LD_FILE = boards/nrf52840_1M_256k.ld
+#else
+#	LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
+#	CIRCUITPY_BLEIO = 1
+#endif
+
+#NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
+
+#QSPI_FLASH_FILESYSTEM = 1
+#EXTERNAL_FLASH_DEVICE_COUNT = 1
+#EXTERNAL_FLASH_DEVICES = "GD25Q16C"
diff --git a/ports/nrf/boards/TG-Watch02A/pins.c b/ports/nrf/boards/TG-Watch02A/pins.c
index b93df80ae9..a856b18eee 100644
--- a/ports/nrf/boards/TG-Watch02A/pins.c
+++ b/ports/nrf/boards/TG-Watch02A/pins.c
@@ -48,8 +48,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-<<<<<<< HEAD
-
     /*TG-Watch02A specific pins*/
 
         //tft / display pins
@@ -74,7 +72,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
 
         { MP_ROM_QSTR(MP_QSTR_ACCEL_INT1), MP_ROM_PTR(&pin_P1_11) },
         { MP_ROM_QSTR(MP_QSTR_ACCEL_INT2), MP_ROM_PTR(&pin_P1_10) },
-        
+
         { MP_ROM_QSTR(MP_QSTR_HAPTIC_INT), MP_ROM_PTR(&pin_P1_07) },
         { MP_ROM_QSTR(MP_QSTR_HAPTIC_ENABLE), MP_ROM_PTR(&pin_P1_06) },
 
@@ -82,8 +80,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
         { MP_ROM_QSTR(MP_QSTR_SMC_RESET), MP_ROM_PTR(&pin_P0_08) },
         { MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_P1_08) },
         { MP_ROM_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_P1_09) },
-=======
->>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
 };
 
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);