diff --git a/README.md b/README.md
index 7516ff9..2ea546c 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 api应用
+=======
+# api_manager
+
+api客户端、服务端应用
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/api_manager.git