diff --git a/README.md b/README.md
index 6b5631e..1c379b0 100644
--- a/README.md
+++ b/README.md
@@ -3,5 +3,15 @@
 
 1.精读小米便签源代码，写泛读报告
 =======
+<<<<<<< HEAD
+<<<<<<< HEAD
+# gitProject1
+abc
+=======
+# gitProject1
+>>>>>>> 9219e5ac71f6be25d7e582668d694b98d6c6b249
+>>>>>>> 56b7401c41e8a93705075c2dec372535147025bf
+=======
 # gitProject1
 >>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee
+>>>>>>> 856149d31b3fdb3d65ebb0c2da0a49c2b8417f9e
diff --git a/doc/~$便签开源代码的泛读报告.docx.LOCAL.docx b/doc/~$便签开源代码的泛读报告.docx.LOCAL.docx
new file mode 100644
index 0000000..9638474
Binary files /dev/null and b/doc/~$便签开源代码的泛读报告.docx.LOCAL.docx differ
diff --git a/doc/小米便签开源代码的泛读报告.docx.LOCAL.docx b/doc/小米便签开源代码的泛读报告.docx.LOCAL.docx
new file mode 100644
index 0000000..b6b92be
Binary files /dev/null and b/doc/小米便签开源代码的泛读报告.docx.LOCAL.docx differ