change editorMode in ConflictDiffModal.tsx

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

@@ -14,8 +14,6 @@ import PageContainer from '../../client/services/PageContainer';
 import AppContainer from '../../client/services/AppContainer';
 import ExpandOrContractButton from '../ExpandOrContractButton';
 
-import { useEditorMode } from '~/stores/ui';
-
 import { IRevisionOnConflict } from '../../interfaces/revision';
 import { UncontrolledCodeMirror } from '../UncontrolledCodeMirror';
 
@@ -45,8 +43,6 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
   const [isModalExpanded, setIsModalExpanded] = useState<boolean>(false);
   const [codeMirrorRef, setCodeMirrorRef] = useState<HTMLDivElement | null>(null);
 
-  const { data: editorMode } = useEditorMode();
-
   const uncontrolledRef = useRef<CodeMirror>(null);
 
   const { pageContainer, appContainer } = props;
@@ -102,6 +98,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
     const codeMirrorVal = uncontrolledRef.current?.editor.doc.getValue();
 
     try {
+      const editorMode = 'editorOnResolveConflict';
       await pageContainer.resolveConflict(codeMirrorVal, editorMode);
       onClose();
       pageContainer.showSuccessToastr();