diff --git a/doc/README.md b/doc/README.md
index 25f8d45..d81c081 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1 +1,5 @@
+<<<<<<< HEAD
 # Documentation
+=======
+这是doc目录的说明文档
+>>>>>>> c8630a7f95e8af73860302cdfe657069ddc7114c