fix missed merge conflict

Author: lalalune

client/package.json

@@ -29,15 +29,9 @@
         "@types/react-dom": "18.3.1",
         "@vitejs/plugin-react": "4.3.3",
         "autoprefixer": "10.4.20",
-<<<<<<< HEAD
         "eslint": "9.13.0",
         "eslint-plugin-react-hooks": "5.0.0",
         "eslint-plugin-react-refresh": "0.4.14",
-=======
-        "eslint": "^9.13.0",
-        "eslint-plugin-react-hooks": "^5.0.0",
-        "eslint-plugin-react-refresh": "^0.4.14",
->>>>>>> 5b6c673ed81a1bd29680e6809c7579493b37b1b7
         "globals": "15.12.0",
         "postcss": "8.4.49",
         "tailwindcss": "3.4.15",