diff --git a/_board/espressif_esp32s3_box_lite.md b/_board/espressif_esp32s3_box_lite.md
index b234a1a9..c64d8e4b 100644
--- a/_board/espressif_esp32s3_box_lite.md
+++ b/_board/espressif_esp32s3_box_lite.md
@@ -7,11 +7,7 @@ manufacturer: "Espressif"
 board_url:
  - "https://www.adafruit.com/product/5511"
 board_image: "espressif_esp32s3_box_lite.jpg"
-<<<<<<< HEAD
-date_added: 2022-7-08
-=======
 date_added: 2022-07-08
->>>>>>> 3d693274c3dcb32e2dfaf508f90b599667e5e843
 family: esp32s3
 features:
   - Wi-Fi