From dde5dcd8fb8bede9ecb4f9ae201569b59f5c3307 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 15 Mar 2024 07:44:33 +0500
Subject: [PATCH] mobile: cleanup

---
 apps/mobile/app/components/list-items/note/wrapper.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/app/components/list-items/note/wrapper.tsx b/apps/mobile/app/components/list-items/note/wrapper.tsx
index 8de6314dc..20691e48a 100644
--- a/apps/mobile/app/components/list-items/note/wrapper.tsx
+++ b/apps/mobile/app/components/list-items/note/wrapper.tsx
@@ -31,6 +31,7 @@ import {
 import { useSelectionStore } from "../../../stores/use-selection-store";
 import { eOnLoadNote, eShowMergeDialog } from "../../../utils/events";
 import { tabBarRef } from "../../../utils/global-refs";
+
 import { NotebooksWithDateEdited, TagsWithDateEdited } from "@notesnook/common";
 import NotePreview from "../../note-history/preview";
 import SelectionWrapper from "../selection-wrapper";
@@ -62,7 +63,7 @@ export const openNote = async (
     return;
   }
 
-  if (!note.conflicted) {
+  if (note.conflicted) {
     eSendEvent(eShowMergeDialog, note);
     return;
   }