diff --git a/README.md b/README.md
index 09047c2..389f47d 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 数据锻造应用，主要对字段进行加工处理
+=======
+# data_forge
+
+数据加工
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/data_forge.git