Merge pull request #4781 from weseek/feat/79579-82795-change-conditional-branch-from-state-to-props

imprv: change state to props on jsx confitional branch

packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -112,7 +112,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
         <i className="icon-fw icon-exclamation" />{t('modal_resolve_conflict.resolve_conflict')}
       </ModalHeader>
       <ModalBody>
-        { pageContainer.state.isConflictDiffModalOpen
+        { props.isOpen
         && (
           <div className="row">
             <div className="col-12 text-center mt-2 mb-4">