diff --git a/project.config.json b/project.config.json
index 4ad5470..7128c3f 100644
--- a/project.config.json
+++ b/project.config.json
@@ -9,12 +9,16 @@
     "enhance": true,
     "postcss": true,
     "minified": true,
-<<<<<<< HEAD
     "compileWorklet": false,
     "uglifyFileName": false,
     "uploadWithSourceMap": true,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
+    "packNpmManually": true,
+    "packNpmRelationList": [
+      {
+        "packageJsonPath": "./package.json",
+        "miniprogramNpmDistDir": "./miniapp/"
+      }
+    ],
     "minifyWXSS": true,
     "minifyWXML": true,
     "localPlugins": false,
@@ -28,15 +32,6 @@
       "disablePlugins": [],
       "outputPath": ""
     }
-=======
-    "packNpmManually": true,
-    "packNpmRelationList": [
-      {
-        "packageJsonPath": "./package.json",
-        "miniprogramNpmDistDir": "./miniapp/"
-      }
-    ]
->>>>>>> cfe379da3ebfa55a448303373ac901ac03c4ad5c
   },
   "compileType": "miniprogram",
   "libVersion": "trial",
@@ -47,4 +42,4 @@
   "condition": {},
   "simulatorPluginLibVersion": {},
   "editorSetting": {}
-}
\ No newline at end of file
+}