diff --git a/README.md b/README.md
index 970ab47..6b5631e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 # gitProject1
 
-1.精读小米便签源代码，写泛读报告
\ No newline at end of file
+1.精读小米便签源代码，写泛读报告
+=======
+# gitProject1
+>>>>>>> 678e0f2fc21bc4a1625205602371ca421396ceee
diff --git a/新建 文本文档.txt b/新建 文本文档.txt
new file mode 100644
index 0000000..ed7c5a9
--- /dev/null
+++ b/新建 文本文档.txt	
@@ -0,0 +1 @@
+zhiyin
\ No newline at end of file