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,