Fix merge conflict

Author: makermelissa

package-lock.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "sass": "^1.77.8",
-    "vite": "^5.3.5"
+    "vite": "^5.4.1"
   },
   "dependencies": {
     "@adafruit/ble-file-transfer-js": "adafruit/ble-file-transfer-js#1.0.2",