diff --git a/README.md b/README.md
index 1667875..9f63bf5 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+<<<<<<< HEAD
 脚本分析应用
 部署位置：/opt/analyze/apps/data_Statistical
 
+=======
+# data_statistical
+
+脚本分析应用
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/data_statistical.git