diff --git a/README.md b/README.md
index 33e3a0e..8890dca 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-
 # bigwork
-
 the is new school working.
-=======
-
 # 工程简介
 
 课堂练习项目
@@ -14,4 +9,4 @@ the is new school working.
 # 延伸阅读
 
 涉及课外的编写思路，要项目要求、习惯。
-> > > > > > > a36cf6c (command init)
+