Conclude merge after resolving conflicts

Author: martinwq997

package.json

@@ -24,14 +24,14 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "tailwindcss": "3.4.15",
-    "typescript": "5.6.3",
+    "typescript": "5.7.2",
     "use-debounce": "^10.0.1",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
     "@types/d3": "^7.4.3",
-    "@types/node": "22.9.1",
+    "@types/node": "22.10.1",
     "@types/react": "18.3.12",
     "@types/react-dom": "18.3.1",
     "eslint": "9.15.0",