resolve merge conflict

Author: mms-gianni

client/package.json

@@ -42,11 +42,7 @@
     "sass": "^1.60.0",
     "typescript": "^5.0.0",
     "unplugin-fonts": "^1.0.3",
-<<<<<<< Updated upstream
-    "vite": "^4.2.0",
-=======
     "vite": "^5.1.8",
->>>>>>> Stashed changes
     "vite-plugin-vuetify": "^1.0.0",
     "vue-tsc": "^2.1.0"
   }