diff --git a/package-lock.json b/package-lock.json
index 74b1003..8c82e9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,11 @@
             "version": "4.2.2",
             "license": "MIT",
             "dependencies": {
+<<<<<<< HEAD
                 "@sern/ioc": "^1.1.2",
+=======
+                "@sern/ioc": "^1.1.0",
+>>>>>>> 6e0333a (asdf)
                 "callsites": "^3.1.0",
                 "cron": "^3.1.7",
                 "deepmerge": "^4.3.1"
@@ -20,7 +24,11 @@
                 "@types/node-cron": "^3.0.11",
                 "@typescript-eslint/eslint-plugin": "5.58.0",
                 "@typescript-eslint/parser": "5.59.1",
+<<<<<<< HEAD
                 "discord.js": "^14.14.1",
+=======
+                "discord.js": "^14.15.3",
+>>>>>>> 6e0333a (asdf)
                 "eslint": "8.39.0",
                 "typescript": "5.0.2",
                 "vitest": "^1.6.0"