diff --git a/README.md b/README.md
index df7bc0a..f7c69c9 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,8 @@
-<<<<<<< HEAD
+
 # xiuosIoT-web
 
 English | [简体中文](./README-zh.md)
 
-> A minimal low code template with Element UI & axios & iconfont & permission control & lint
-
 **Live demo:** http://115.238.53.59:9898/