diff --git a/README.md b/README.md
index facb57d..06d83b4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,2 @@
 # GitPractise
-<<<<<<< HEAD
 lisi
-=======
-zhangsan
->>>>>>> 3a35eae6b076aca03c24978ad5c8800579d45e80