diff --git a/doc/泛读报告/泛读报告.md b/doc/泛读报告/泛读报告.md
index 91b1bee..4cae427 100644
--- a/doc/泛读报告/泛读报告.md
+++ b/doc/泛读报告/泛读报告.md
@@ -1,4 +1,12 @@
+<<<<<<< HEAD
                            
 
 1 2
-85de61dbca5a0b894469df847a42be9e5905c00a
\ No newline at end of file
+85de61dbca5a0b894469df847a42be9e5905c00a
+=======
+
+test
+
+1 2
+85de61dbca5a0b894469df847a42be9e5905c00a
+>>>>>>> b8ef232 (提交说明)