diff --git a/README.md b/README.md
index 6aa6d18..63107ac 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 文件上传应用
+=======
+# appendix_upload
+
+文件上传应用
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appendix_upload.git