diff --git a/package-lock.json b/package-lock.json
index 6877a29..2a2d628 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,8 +25,13 @@
         "eslint-plugin-react-hooks": "^7.1.1",
         "http-server": "^14.1.1",
         "jsdom": "^29.1.1",
+<<<<<<< HEAD
+        "knip": "^6.24.0",
+        "prettier": "^3.8.4",
+=======
         "knip": "^6.18.0",
         "prettier": "^3.9.4",
+>>>>>>> origin/main
         "react": "^19.2.4",
         "react-dom": "^19.2.4",
         "react-router": "^8.1.0",
@@ -4755,7 +4760,9 @@
       }
     },
     "node_modules/knip": {
-      "version": "6.18.0",
+      "version": "6.24.0",
+      "resolved": "https://registry.npmjs.org/knip/-/knip-6.24.0.tgz",
+      "integrity": "sha512-PokLlgeEjLh1rAsB7ts+52wZ37HBr1nDhE6NNONwEaXdeZGCJOkP7ZlIAI2Gtu8xohquzTWy75bc/1diI9shQw==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index 586ca8b..1cb0b79 100644
--- a/package.json
+++ b/package.json
@@ -164,8 +164,13 @@
     "eslint-plugin-react-hooks": "^7.1.1",
     "http-server": "^14.1.1",
     "jsdom": "^29.1.1",
+<<<<<<< HEAD
+    "knip": "^6.24.0",
+    "prettier": "^3.8.4",
+=======
     "knip": "^6.18.0",
     "prettier": "^3.9.4",
+>>>>>>> origin/main
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "react-router": "^8.1.0",