fix some conflict errors

Author: ladyada

Diff for: .github/workflows/test_selfhosted_runner.yml

@@ -10,10 +10,7 @@ jobs:
   build:
     name: Dummy test - self hosted GHR
     runs-on: self-hosted
-<<<<<<< HEAD
     if: github.repository == 'espressif/arduino-esp32'
-=======
->>>>>>> 879c109d (revert deletion)
     steps:
       - name: Check out repo
         uses: actions/checkout@v2

Diff for: boards.txt

@@ -4556,15 +4556,9 @@ adafruit_feather_esp32s2.menu.DebugLevel.debug=Debug
 adafruit_feather_esp32s2.menu.DebugLevel.debug.build.code_debug=4
 adafruit_feather_esp32s2.menu.DebugLevel.verbose=Verbose
 adafruit_feather_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
-<<<<<<< HEAD
 
 ##############################################################
 
-=======
-
-##############################################################
-
->>>>>>> ed84c4b3 (fix feather esp32-s2 name (it has psram!) and add tft variant)
 adafruit_feather_esp32s2_tft.name=Adafruit Feather ESP32-S2 TFT
 adafruit_feather_esp32s2_tft.vid.0=0x239A
 adafruit_feather_esp32s2_tft.pid.0=0x810F
@@ -4726,7 +4720,6 @@ adafruit_feather_esp32s2_tft.menu.DebugLevel.debug=Debug
 adafruit_feather_esp32s2_tft.menu.DebugLevel.debug.build.code_debug=4
 adafruit_feather_esp32s2_tft.menu.DebugLevel.verbose=Verbose
 adafruit_feather_esp32s2_tft.menu.DebugLevel.verbose.build.code_debug=5
-<<<<<<< HEAD
 
 ##############################################################
 
@@ -4891,8 +4884,6 @@ adafruit_qtpy_esp32s2.menu.DebugLevel.debug=Debug
 adafruit_qtpy_esp32s2.menu.DebugLevel.debug.build.code_debug=4
 adafruit_qtpy_esp32s2.menu.DebugLevel.verbose=Verbose
 adafruit_qtpy_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
-=======
->>>>>>> ed84c4b3 (fix feather esp32-s2 name (it has psram!) and add tft variant)
 
 ##############################################################