From d665f73f299d371b167e6772dcfee82b8d5cac80 Mon Sep 17 00:00:00 2001
From: LottesLiu <liushasha2018@hotmail.com>
Date: Fri, 14 Jun 2019 18:23:55 +0800
Subject: [PATCH] hat butterfly

---
 docs/en/hat/hat-env.md    |  4 +---
 docs/en/hat/hat-pir.md    | 13 ++-----------
 docs/en/unit/butterfly.md |  5 +----
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/docs/en/hat/hat-env.md b/docs/en/hat/hat-env.md
index ad18153b..05b6686c 100644
--- a/docs/en/hat/hat-env.md
+++ b/docs/en/hat/hat-env.md
@@ -39,7 +39,7 @@ Typical Magnetic Field：
 
 ## Schematic
 
-- **[Schematic](https://github.com/m5stack/M5-Schematic/blob/master/Hat/StickHat_ENV.pdf)**
+<img src="assets\img\product_pics\hat\env_hat\env_hat_04.jpg" width="50%" height="50%">
 
 ## Links
 
@@ -62,8 +62,6 @@ Typical Magnetic Field：
  <tr><td>ENV Unit</td><td>SCL</td><td>SDA</td><td>5V</td><td>GND</td></tr>
 </table>
 
-## Schematic
 
-<img src="assets\img\product_pics\hat\env_hat\env_hat_04.jpg" width="50%" height="50%">
 
 
diff --git a/docs/en/hat/hat-pir.md b/docs/en/hat/hat-pir.md
index 2f51d572..28d3d547 100644
--- a/docs/en/hat/hat-pir.md
+++ b/docs/en/hat/hat-pir.md
@@ -34,7 +34,8 @@
 
 ## Schematic
 
-- **[Schematic](https://github.com/m5stack/M5-Schematic/blob/master/Hat/StickHat_PIR.pdf)**
+<img src="assets\img\product_pics\hat\pir_hat\pir_hat_04.jpg" width="50%" height="50%">
+
 
 ## Links
 
@@ -42,15 +43,5 @@
 
 - **[Official forum](http://forum.m5stack.com/)**
 
-<<<<<<< HEAD
-- **[Schematic](https://github.com/m5stack/M5-Schematic/blob/master/Hat/StickHat_PIR.pdf)**
-  
 ## Example
 - **[Arduino](https://github.com/m5stack/M5StickC/tree/master/examples/Hat/PIR)**
-=======
-
->>>>>>> 6786aadd2684c17d8e8f741bda46cecb710c2ca9
-
-## Schematic
-
-<img src="assets\img\product_pics\hat\pir_hat\pir_hat_04.jpg" width="50%" height="50%">
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)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:bulb:**[Assembly Steps](#Assembly-Steps)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;🛒**[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)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-=======
-:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:bulb:**[Steps](#Steps)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;🛒**[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)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
->>>>>>> 6786aadd2684c17d8e8f741bda46cecb710c2ca9
+
 
 ## Description