Fixed:

- Conflict merge of internal files is no longer broken.
Improved:
- Smoother status display inside the editor.

src/main.ts

@@ -1722,10 +1722,14 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
 
             if (this.settings.showStatusOnEditor) {
                 const root = activeDocument.documentElement;
-                root.style.setProperty("--slsmessage", '"' + (newMsg + "\n" + newLog).split("\n").join("\\a ") + '"');
+                const q = root.querySelectorAll(`.CodeMirror-wrap,.cm-s-obsidian>.cm-editor,.canvas-wrapper`);
+                q.forEach(e => e.setAttr("data-log", '' + (newMsg + "\n" + newLog) + ''))
+                // root.style.setProperty("--slsmessage", '"' + (newMsg + "\n" + newLog).split("\n").join("\\a ") + '"');
             } else {
                 const root = activeDocument.documentElement;
-                root.style.setProperty("--slsmessage", '""');
+                // root.style.setProperty("--slsmessage", '""');
+                const q = root.querySelectorAll(`.CodeMirror-wrap,.cm-s-obsidian>.cm-editor,.canvas-wrapper`);
+                q.forEach(e => e.setAttr("data-log", ''))
             }
             if (this.logHideTimer != null) {
                 clearTimeout(this.logHideTimer);
@@ -2973,10 +2977,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         if (doc._conflicts.length == 0) return false;
         Logger(`Hidden file conflicted:${id2filenameInternalChunk(id)}`);
         const conflicts = doc._conflicts.sort((a, b) => Number(a.split("-")[0]) - Number(b.split("-")[0]));
-
         const revA = doc._rev;
         const revB = conflicts[0];
 
+        if (doc._id.endsWith(".json")) {
             const conflictedRev = conflicts[0];
             const conflictedRevNo = Number(conflictedRev.split("-")[0]);
             //Search 
@@ -2999,7 +3003,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             } else {
                 Logger(`Object merge is not applicable.`, LOG_LEVEL.VERBOSE);
             }
-
+        }
         const revBDoc = await this.localDatabase.localDatabase.get(id, { rev: revB });
         // determine which revision should been deleted.
         // simply check modified time

styles.css

@@ -101,7 +101,7 @@
 .CodeMirror-wrap::before,
 .cm-s-obsidian>.cm-editor::before,
 .canvas-wrapper::before {
-    content: var(--slsmessage);
+    content: attr(data-log);
     text-align: right;
     white-space: pre-wrap;
     position: absolute;