fix merge conflict

Author: abhishek-nexgen-dev

package.json

@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@hookform/resolvers": "^5.2.2",
-    "@tanstack/react-query": "^5.100.8",
-    "@tauri-apps/api": "^2.10.1",
-    "@tauri-apps/plugin-opener": "^2.5.3",
+    "@tanstack/react-query": "^5.100.9",
+    "@tauri-apps/api": "^2.11.0",
+    "@tauri-apps/plugin-opener": "^2.5.4",
     "@tauri-apps/plugin-process": "^2.3.1",
     "@tauri-apps/plugin-updater": "^2.10.1",
     "class-variance-authority": "^0.7.1",
@@ -29,22 +29,22 @@
     "markdown-to-jsx": "^9.7.16",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
-    "react": "^19.2.5",
+    "react": "^19.2.6",
     "react-day-picker": "^9.14.0",
-    "react-dom": "^19.2.5",
-    "react-hook-form": "^7.73.1",
+    "react-dom": "^19.2.6",
+    "react-hook-form": "^7.75.0",
     "react-icons": "^5.6.0",
-    "react-router": "^7.14.2",
-    "react-router-dom": "^7.14.2",
+    "react-router": "^7.15.0",
+    "react-router-dom": "^7.15.0",
     "recharts": "^3.8.1",
     "tailwind-merge": "^3.5.0",
-    "zod": "^4.3.6"
+    "zod": "^4.4.3"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.4",
     "@tailwindcss/typography": "^0.5.19",
-    "@tailwindcss/vite": "^4.2.4",
-    "@tauri-apps/cli": "^2.10.1",
+    "@tailwindcss/vite": "^4.3.0",
+    "@tauri-apps/cli": "^2.11.1",
     "@types/markdown-to-jsx": "^7.0.1",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
@@ -53,14 +53,14 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.2",
-    "globals": "^17.5.0",
+    "globals": "^17.6.0",
     "prettier": "^3.8.3",
     "shadcn": "^3.8.5",
-    "tailwindcss": "^4.2.4",
+    "tailwindcss": "^4.3.0",
     "tw-animate-css": "^1.4.0",
     "typescript": "~5.8.3",
-    "typescript-eslint": "^8.59.0",
-    "vite": "^7.3.2"
+    "typescript-eslint": "^8.59.2",
+    "vite": "^7.3.3"
   },
   "overrides": {
     "ip-address": "^10.1.1",