diff --git a/src/modules/core/ModuleRebuilder.ts b/src/modules/core/ModuleRebuilder.ts
index c60705f..4cefcfd 100644
--- a/src/modules/core/ModuleRebuilder.ts
+++ b/src/modules/core/ModuleRebuilder.ts
@@ -51,7 +51,7 @@ export class ModuleRebuilder extends AbstractModule implements Rebuilder {
         await this.services.setting.suspendExtraSync();
         this.core.settings.isConfigured = true;
 
-        await this.services.setting.onRealiseSetting();
+        await this.services.setting.realiseSetting();
         await this.services.remote.markLocked();
         await this.services.remote.tryResetDatabase();
         await this.services.remote.markLocked();
@@ -70,7 +70,7 @@ export class ModuleRebuilder extends AbstractModule implements Rebuilder {
         await this.services.setting.suspendExtraSync();
         await this.askUseNewAdapter();
         this.core.settings.isConfigured = true;
-        await this.services.setting.onRealiseSetting();
+        await this.services.setting.realiseSetting();
         await this.resetLocalDatabase();
         await delay(1000);
         await this.services.databaseEvents.initialiseDatabase(true, true, true);
@@ -181,7 +181,7 @@ export class ModuleRebuilder extends AbstractModule implements Rebuilder {
         await this.askUseNewAdapter();
         this.core.settings.isConfigured = true;
         await this.suspendReflectingDatabase();
-        await this.services.setting.onRealiseSetting();
+        await this.services.setting.realiseSetting();
         await this.resetLocalDatabase();
         await delay(1000);
         await this.services.database.openDatabase();
diff --git a/src/modules/core/ModuleReplicatorCouchDB.ts b/src/modules/core/ModuleReplicatorCouchDB.ts
index 2e7a126..688b964 100644
--- a/src/modules/core/ModuleReplicatorCouchDB.ts
+++ b/src/modules/core/ModuleReplicatorCouchDB.ts
@@ -15,13 +15,12 @@ export class ModuleReplicatorCouchDB extends AbstractModule {
         return Promise.resolve(new LiveSyncCouchDBReplicator(this.core));
     }
     _everyAfterResumeProcess(): Promise<boolean> {
-        if (!this.services.appLifecycle.isSuspended()) return Promise.resolve(true);
+        if (this.services.appLifecycle.isSuspended()) return Promise.resolve(true);
         if (!this.services.appLifecycle.isReady()) return Promise.resolve(true);
         if (this.settings.remoteType != REMOTE_MINIO && this.settings.remoteType != REMOTE_P2P) {
             const LiveSyncEnabled = this.settings.liveSync;
             const continuous = LiveSyncEnabled;
             const eventualOnStart = !LiveSyncEnabled && this.settings.syncOnStart;
-
             // If enabled LiveSync or on start, open replication
             if (LiveSyncEnabled || eventualOnStart) {
                 // And note that we do not open the conflict detection dialogue directly during this process.
diff --git a/src/modules/essentialObsidian/ModuleObsidianMenu.ts b/src/modules/essentialObsidian/ModuleObsidianMenu.ts
index 79dd990..e3c24aa 100644
--- a/src/modules/essentialObsidian/ModuleObsidianMenu.ts
+++ b/src/modules/essentialObsidian/ModuleObsidianMenu.ts
@@ -59,7 +59,7 @@ export class ModuleObsidianMenu extends AbstractObsidianModule {
                     this.settings.liveSync = true;
                     this._log("LiveSync Enabled.", LOG_LEVEL_NOTICE);
                 }
-                await this.services.setting.onRealiseSetting();
+                await this.services.setting.realiseSetting();
                 await this.services.setting.saveSettingData();
             },
         });
@@ -74,7 +74,7 @@ export class ModuleObsidianMenu extends AbstractObsidianModule {
                     this.services.appLifecycle.setSuspended(true);
                     this._log("Self-hosted LiveSync suspended", LOG_LEVEL_NOTICE);
                 }
-                await this.services.setting.onRealiseSetting();
+                await this.services.setting.realiseSetting();
                 await this.services.setting.saveSettingData();
             },
         });
diff --git a/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts b/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts
index 2b842ed..2cc5c56 100644
--- a/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts
+++ b/src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts
@@ -85,17 +85,15 @@ export class ConflictResolveModal extends Modal {
             }
         }
 
-        diff = diff.replace(/\n/g, "<br>");
-        div.innerHTML = diff;
         const div2 = contentEl.createDiv("");
         const date1 =
             new Date(this.result.left.mtime).toLocaleString() + (this.result.left.deleted ? " (Deleted)" : "");
         const date2 =
             new Date(this.result.right.mtime).toLocaleString() + (this.result.right.deleted ? " (Deleted)" : "");
-        div2.innerHTML = `
+        div2.setHTMLUnsafe(`
 <span class='deleted'><span class='conflict-dev-name'>${this.localName}</span>: ${date1}</span><br>
 <span class='added'><span class='conflict-dev-name'>${this.remoteName}</span>: ${date2}</span><br>
-        `;
+        `);
         contentEl.createEl("button", { text: `Use ${this.localName}` }, (e) =>
             e.addEventListener("click", () => this.sendResponse(this.result.right.rev))
         ).style.marginRight = "4px";
@@ -110,6 +108,13 @@ export class ConflictResolveModal extends Modal {
         contentEl.createEl("button", { text: !this.pluginPickMode ? "Not now" : "Cancel" }, (e) =>
             e.addEventListener("click", () => this.sendResponse(CANCELLED))
         ).style.marginRight = "4px";
+        diff = diff.replace(/\n/g, "<br>");
+        // div.innerHTML = diff;
+        if (diff.length > 100 * 1024) {
+            div.setText("(Too large diff to display)");
+        } else {
+            div.setHTMLUnsafe(diff);
+        }
     }
 
     sendResponse(result: MergeDialogResult) {
diff --git a/src/modules/features/SettingDialogue/PaneSyncSettings.ts b/src/modules/features/SettingDialogue/PaneSyncSettings.ts
index b39b945..c7e2da4 100644
--- a/src/modules/features/SettingDialogue/PaneSyncSettings.ts
+++ b/src/modules/features/SettingDialogue/PaneSyncSettings.ts
@@ -105,7 +105,7 @@ export function paneSyncSettings(
                 if (!this.editingSettings.isConfigured) {
                     this.editingSettings.isConfigured = true;
                     await this.saveAllDirtySettings();
-                    await this.services.setting.onRealiseSetting();
+                    await this.services.setting.realiseSetting();
                     await this.rebuildDB("localOnly");
                     // this.resetEditingSettings();
                     if (
@@ -124,13 +124,13 @@ export function paneSyncSettings(
                         await this.confirmRebuild();
                     } else {
                         await this.saveAllDirtySettings();
-                        await this.services.setting.onRealiseSetting();
+                        await this.services.setting.realiseSetting();
                         this.services.appLifecycle.askRestart();
                     }
                 }
             } else {
                 await this.saveAllDirtySettings();
-                await this.services.setting.onRealiseSetting();
+                await this.services.setting.realiseSetting();
             }
         });
     });
@@ -169,7 +169,7 @@ export function paneSyncSettings(
             }
             await this.saveSettings(["liveSync", "periodicReplication"]);
 
-            await this.services.setting.onRealiseSetting();
+            await this.services.setting.realiseSetting();
         });
 
         new Setting(paneEl)
diff --git a/src/modules/main/ModuleLiveSyncMain.ts b/src/modules/main/ModuleLiveSyncMain.ts
index d1e1ba0..ba51989 100644
--- a/src/modules/main/ModuleLiveSyncMain.ts
+++ b/src/modules/main/ModuleLiveSyncMain.ts
@@ -48,7 +48,7 @@ export class ModuleLiveSyncMain extends AbstractModule {
         }
         if (!(await this.core.services.appLifecycle.onFirstInitialise())) return false;
         // await this.core.$$realizeSettingSyncMode();
-        await this.services.setting.onRealiseSetting();
+        await this.services.setting.realiseSetting();
         fireAndForget(async () => {
             this._log($msg("moduleLiveSyncMain.logAdditionalSafetyScan"), LOG_LEVEL_VERBOSE);
             if (!(await this.services.appLifecycle.onScanningStartupIssues())) {
@@ -67,7 +67,7 @@ export class ModuleLiveSyncMain extends AbstractModule {
             eventHub.emitEvent(EVENT_REQUEST_RELOAD_SETTING_TAB);
         });
         eventHub.onEvent(EVENT_SETTING_SAVED, (settings: ObsidianLiveSyncSettings) => {
-            fireAndForget(() => this.core.services.setting.onRealiseSetting());
+            fireAndForget(() => this.core.services.setting.realiseSetting());
         });
         return Promise.resolve(true);
     }