diff --git a/package.json b/package.json
index 6d91636..9705d70 100755
--- a/package.json
+++ b/package.json
@@ -4,11 +4,7 @@
   "description": "",
   "private": true,
   "dependencies": {
-<<<<<<< HEAD
     "@cool-midway/core": "^5.1.7",
-=======
-    "@cool-midway/core": "^5.1.5",
->>>>>>> 317fc849c01cfaf6c0e1bc8b9362d0a542727fa8
     "@cool-midway/es": "^5.0.2",
     "@cool-midway/file": "^5.0.7",
     "@cool-midway/pay": "^5.0.0",