diff --git a/docs/en/hat/hat-env.md b/docs/en/hat/hat-env.md
index 793696f7..4a47b1c5 100644
--- a/docs/en/hat/hat-env.md
+++ b/docs/en/hat/hat-env.md
@@ -39,8 +39,6 @@ Typical Magnetic Field:
## Schematic
-- **[Schematic](https://github.com/m5stack/M5-Schematic/blob/master/Hat/StickHat_ENV.pdf)**
-
## Links
@@ -78,5 +76,3 @@ Typical Magnetic Field:
+
@@ -59,6 +60,3 @@
## Example
- **[Arduino](https://github.com/m5stack/M5StickC/tree/master/examples/Hat/ENV)**
-
-
-
diff --git a/docs/en/unit/butterfly.md b/docs/en/unit/butterfly.md
index 290dc637..fb6b8119 100644
--- a/docs/en/unit/butterfly.md
+++ b/docs/en/unit/butterfly.md
@@ -4,11 +4,8 @@
***
-<<<<<<< HEAD
:memo:**[Description](#Description)** :bulb:**[Assembly Steps](#Assembly-Steps)** 🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Rubber-Band-Powered-Butterfly-Launcher-with-SERVO-control-and-GROVE-Cable-Adapter-Children-s/3226069_32956965036.html?spm=2114.12010615.8148356.2.486b2682Z5xogF)**
-=======
-:memo:**[Description](#Description)** :bulb:**[Steps](#Steps)** 🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Rubber-Band-Powered-Butterfly-Launcher-with-SERVO-control-and-GROVE-Cable-Adapter-Children-s/3226069_32956965036.html?spm=2114.12010615.8148356.2.486b2682Z5xogF)**
->>>>>>> 6786aadd2684c17d8e8f741bda46cecb710c2ca9
+
## Description