fix: Fixed issue where conflict resolution menu was not selectable [skip e2e]

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}