diff --git a/README.md b/README.md
index 26900f5..ad0c6de 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 指标计算
+=======
+# datacalculate
+
+指标计算
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/datacalculate.git