From 6fcbde772c846c29e932545f12161a958e6a3edd Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Wed, 15 May 2024 12:34:23 +0500
Subject: [PATCH] core: fix notes marked as conflicted wrongly

---
 packages/core/src/api/sync/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/api/sync/index.ts b/packages/core/src/api/sync/index.ts
index 02686af67..4c40389b5 100644
--- a/packages/core/src/api/sync/index.ts
+++ b/packages/core/src/api/sync/index.ts
@@ -251,6 +251,7 @@ class Sync {
           .selectFrom("content")
           .select("noteId as id")
           .where("conflicted", "is not", null)
+          .where("conflicted", "is not", false)
           .$castTo<string | null>()
       )
       .set({ conflicted: true })