fix: conflict

Author: jcs090218

package.json

@@ -37,9 +37,15 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@yao-pkg/pkg": "^6.13.0",
     "cross-env": "^10.1.0",
     "jest": "^30.2.0",
+=======
+    "@yao-pkg/pkg": "^6.0.0",
+    "cross-env": "^10.1.0",
+    "jest": "^29.7.0",
+>>>>>>> 6584417b4a9e36c671f48ac1d2689bc2ce418370
     "semver-compare": "^1.0.0"
   },
   "jest": {