From 7ea182eb5b7c48146a76adb9bb33995c4d660a23 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Mon, 26 Jun 2023 13:12:11 +0500
Subject: [PATCH] mobile: cleanup

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

diff --git a/apps/mobile/app/components/list-items/note/wrapper.js b/apps/mobile/app/components/list-items/note/wrapper.js
index 616febf2d..21df05dcf 100644
--- a/apps/mobile/app/components/list-items/note/wrapper.js
+++ b/apps/mobile/app/components/list-items/note/wrapper.js
@@ -68,7 +68,7 @@ export const openNote = async (item, isTrash, setSelectedItem, isSheet) => {
     clearSelection();
   }
 
-  if (!_note.conflicted) {
+  if (_note.conflicted) {
     eSendEvent(eShowMergeDialog, _note);
     return;
   }