## 0.24.14

### Fixed

- Resolving conflicts of JSON files (and sensibly merging them) is now working fine, again!
    - And, failure logs are more informative.
- More robust to release the event listeners on unwatching the local database.

### Refactored

- JSON file conflict resolution dialogue has been rewritten into svelte v5.
- Upgrade eslint.
- Remove unnecessary pragma comments for eslint.

src/features/HiddenFileSync/CmdHiddenFileSync.ts

@@ -701,7 +701,7 @@ Offline Changed files: ${processFiles.length}`;
                             ?.filter((e) => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo)
                             .first()?.rev ?? "";
                     const result = await this.plugin.localDatabase.mergeObject(
-                        path,
+                        doc.path,
                         commonBase,
                         doc._rev,
                         conflictedRev