diff --git a/src/ObsidianLiveSyncSettingTab.ts b/src/ObsidianLiveSyncSettingTab.ts
index f215258..52cbcc2 100644
--- a/src/ObsidianLiveSyncSettingTab.ts
+++ b/src/ObsidianLiveSyncSettingTab.ts
@@ -412,7 +412,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Apply")
                     .setWarning()
                     .setDisabled(false)
-                    .setClass("sls-btn-right")
                     .onClick(async () => {
                         await applyEncryption(true);
                     })
@@ -422,7 +421,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Apply w/o rebuilding")
                     .setWarning()
                     .setDisabled(false)
-                    .setClass("sls-btn-right")
                     .onClick(async () => {
                         await applyEncryption(false);
                     })
@@ -470,7 +468,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Send")
                     .setWarning()
                     .setDisabled(false)
-                    .setClass("sls-btn-left")
                     .onClick(async () => {
                         await rebuildDB("remoteOnly");
                     })
@@ -485,7 +482,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Rebuild")
                     .setWarning()
                     .setDisabled(false)
-                    .setClass("sls-btn-left")
                     .onClick(async () => {
                         await rebuildDB("rebuildBothByThisDevice");
                     })
@@ -760,7 +756,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Fetch")
                     .setWarning()
                     .setDisabled(false)
-                    .setClass("sls-btn-left")
                     .onClick(async () => {
                         await rebuildDB("localOnly");
                     })
@@ -1103,7 +1098,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Touch")
                     .setWarning()
                     .setDisabled(false)
-                    .setClass("sls-btn-left")
                     .onClick(async () => {
                         const filesAll = await this.plugin.scanInternalFiles();
                         const targetFiles = await this.plugin.filterTargetFiles(filesAll);
diff --git a/src/lib b/src/lib
index 9fe5ce4..bfad1f8 160000
--- a/src/lib
+++ b/src/lib
@@ -1 +1 @@
-Subproject commit 9fe5ce421f48064368230e724bc8d8bfb270b44f
+Subproject commit bfad1f86d3b291bf0c742fe6e6464c22b87affb2
diff --git a/src/main.ts b/src/main.ts
index 097abf3..ef6559e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2176,7 +2176,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             const conflictedRevNo = Number(conflictedRev.split("-")[0]);
             //Search 
             const revFrom = (await this.localDatabase.localDatabase.get(id2path(path), { revs_info: true })) as unknown as LoadedEntry & PouchDB.Core.GetMeta;
-            const commonBase = revFrom._revs_info.filter(e => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo).first().rev ?? "";
+            const commonBase = revFrom._revs_info.filter(e => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo).first()?.rev ?? "";
             let p = undefined;
             if (commonBase) {
                 if (isSensibleMargeApplicable(path)) {
diff --git a/styles.css b/styles.css
index d9b1959..6212dfa 100644
--- a/styles.css
+++ b/styles.css
@@ -85,13 +85,6 @@
 
 } */
 
-.sls-btn-left {
-    padding-right: 4px;
-}
-
-.sls-btn-right {
-    padding-left: 4px;
-}
 
 .sls-header-button {
     margin-left: 2em;