chore: resolved conflicts

frontend/package.json

@@ -25,8 +25,7 @@
     "@editorjs/paragraph": "2.11.3",
     "@editorjs/simple-image": "1.6.0",
     "@editorjs/table": "2.4.2",
-    "@vueuse/core": "10.4.1",
-    "@vueuse/router": "12.7.0",
+    "@vueuse/core": "^14.1.0",
     "ace-builds": "1.36.2",
     "apexcharts": "4.3.0",
     "chart.js": "4.4.1",
@@ -34,7 +33,7 @@
     "dayjs": "1.11.10",
     "dompurify": "3.2.6",
     "feather-icons": "4.28.0",
-    "frappe-ui": "^0.1.256",
+    "frappe-ui": "^0.1.261",
     "highlight.js": "11.11.1",
     "lucide-vue-next": "0.383.0",
     "markdown-it": "14.0.0",
@@ -43,11 +42,11 @@
     "socket.io-client": "4.7.2",
     "thememirror": "2.0.1",
     "typescript": "5.7.2",
-    "vue": "^3.5.0",
+    "vue": "^3.5.27",
     "vue-chartjs": "5.3.0",
     "vue-codemirror": "6.1.1",
     "vue-draggable-next": "2.2.1",
-    "vue-router": "4.2.2",
+    "vue-router": "^4.6.4",
     "vue3-apexcharts": "1.8.0",
     "vuedraggable": "4.1.0"
   },