diff --git a/README.md b/README.md
index 72c909d..ac5e997 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 智谱大模型应用
+=======
+# bigmodel
+
+智普大模型应用
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/bigmodel.git