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