diff --git a/package.json b/package.json
index 13de65e..53cbdf1 100644
--- a/package.json
+++ b/package.json
@@ -19,11 +19,7 @@
     "@vant/weapp": "^1.10.3",
     "decimal.js": "^10.3.1",
     "miniprogram-sm-crypto": "^0.3.8",
-<<<<<<< HEAD
-    "moment": "^2.29.3",
+    "moment": "2.29.3",
     "regenerator": "^0.14.7"
-=======
-    "moment": "^2.29.4"
->>>>>>> refs/remotes/origin/dd-7
   }
 }