SimPaypl
diff --git a/‎package-lock.json
+80-20 b/‎package-lock.json
+80-20
diff --git a/‎package.json
+6 b/‎package.json
+6
@@ -46,9 +46,15 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.16.4",
+<<<<<<< HEAD
     "@biomejs/biome": "1.9.3",
     "@changesets/cli": "^2.27.9",
     "@types/node": "^22.7.5",
+=======
+    "@biomejs/biome": "1.9.2",
+    "@changesets/cli": "^2.27.8",
+    "@types/node": "^22.5.5",
+>>>>>>> origin/main
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3"
   },