diff --git a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx index 40d369117..2519d9f28 100644 --- a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx +++ b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx @@ -863,7 +863,7 @@ class NoteView extends AbstractComponent { ? 'component' : 'plain' - const shouldShowConflictsButton = this.state.conflictedNotes.length > 0 + const shouldShowConflictsButton = this.state.conflictedNotes.length > 0 && !this.state.readonly return (