From c9080dae4edc085a94cfbdd0c2f2153a378aff5f Mon Sep 17 00:00:00 2001
From: fyears <1142836+fyears@users.noreply.github.com>
Date: Tue, 11 Jun 2024 00:44:19 +0800
Subject: [PATCH] yeah a fix for the sync

---
 src/sync.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sync.ts b/src/sync.ts
index c196416..d0cae0a 100644
--- a/src/sync.ts
+++ b/src/sync.ts
@@ -1172,7 +1172,7 @@ const dispatchOperationToActualV3 = async (
       r.key
     );
     if (conflictAction === "smart_conflict") {
-      if (isMergable(r.remote!)) {
+      if (isMergable(r.local!)) {
         await clearFileContentHistoryByVaultAndProfile(
           db,
           vaultRandomID,