fix(FE): resolve merge conflict with branch development

package.json

@@ -20,7 +20,7 @@
     "jspdf": "^3.0.4",
     "jspdf-autotable": "^5.0.2",
     "moment": "^2.30.1",
-    "next": "15.5.9",
+    "next": "^15.5.9",
     "react": "19.1.0",
     "react-day-picker": "^9.11.1",
     "react-dom": "19.1.0",
@@ -31,7 +31,7 @@
     "swr": "^2.3.6",
     "tailwind-merge": "^3.3.1",
     "use-debounce": "^10.0.6",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
+    "xlsx": "^0.18.5",
     "yup": "^1.7.0",
     "zustand": "^5.0.8"
   },
@@ -50,4 +50,4 @@
     "tailwindcss": "^4",
     "typescript": "^5"
   }
-}
+}