From 493d5e91f6e9251c84717cc0823d26b5750e9942 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Wed, 30 Aug 2023 09:42:17 +0530
Subject: [PATCH] fix: Fixed issue where conflict resolution menu was not
 selectable [skip e2e]

---
 .../NoteConflictResolutionModal/NoteConflictResolutionModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx b/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx
index 82960feb2..4693e3eca 100644
--- a/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx
@@ -205,7 +205,7 @@ const NoteConflictResolutionModal = ({
               open={isSelectOpen}
               togglePopover={selectStore.toggle}
               anchorElement={selectAnchor}
-              className="!fixed z-modal border border-border py-1"
+              overrideZIndex="z-modal"
               side="top"
               align="end"
               offset={4}