diff --git a/miniapp/project.config.json b/miniapp/project.config.json
index 967484a..0566499 100644
--- a/miniapp/project.config.json
+++ b/miniapp/project.config.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "description": "sankey miniapp standalone config",
   "packOptions": {
     "ignore": []
@@ -17,3 +18,29 @@
   "srcMiniprogramRoot": "./",
   "condition": {}
 }
+=======
+  "setting": {
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "uglifyFileName": false,
+    "enhance": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useCompilerPlugins": false,
+    "minifyWXML": true
+  },
+  "compileType": "miniprogram",
+  "simulatorPluginLibVersion": {},
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wxcf0f89b6eb65759e",
+  "editorSetting": {}
+}
+>>>>>>> 2cafdbb8fe6909bf187472a961427bb67e990218