diff --git a/README.md b/README.md
index 970ab47..ae8129c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,12 @@
+<<<<<<< HEAD
 # gitProject1
 
-1.精读小米便签源代码，写泛读报告
\ No newline at end of file
+1.精读小米便签源代码，写泛读报告
+=======
+<<<<<<< HEAD
+# gitProject1
+abc
+=======
+# gitProject1
+>>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249
+>>>>>>> 56b7401c41e8a93705075c2dec372535147025bf