Merge

Author: owjs3901

package.json

@@ -18,23 +18,15 @@
     "vitest": "^3.2.4",
     "@vitest/coverage-v8": "^3.2.4",
     "@changesets/cli": "^2.29.7",
-<<<<<<< HEAD
-    "@types/node": "^24.5.1",
-=======
     "@types/node": "^24.5.2",
->>>>>>> main
     "happy-dom": "^18.0.1",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "14.6.1",
     "@testing-library/jest-dom": "^6.8.0",
     "@devup-ui/vite-plugin": "workspace:*"
   },
   "author": "devfive",
-<<<<<<< HEAD
-  "packageManager": "[email protected]",
-=======
   "packageManager": "[email protected]",
->>>>>>> main
   "resolutions": {
     "vite": "^6"
   }