diff --git a/README.md b/README.md
index df7bc0a..5e89f00 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 # xiuosIoT-web
 
 English | [简体中文](./README-zh.md)