diff --git a/README.md b/README.md
index 87620fe..4e5c230 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1 @@
-<<<<<<< HEAD
-智谱大模型应用
-=======
-<<<<<<< HEAD
-应用管理中心
-=======
-# appliction_manager
-
-sba应用管理
->>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git
->>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git
+sba应用管理
\ No newline at end of file