i18n

packages/app/resource/locales/en_US/translation.json

@@ -460,6 +460,10 @@
     "enable_textlint": "Enable Textlint",
     "dont_ask_again": "Don't ask again"
   },
+  "modal_resolve_conflict": {
+    "title": "Resolve Conflict",
+    "resolve_and_save" : "Resolve and save"
+  },
   "link_edit": {
     "edit_link": "Edit Link",
     "set_link_and_label": "Set link and label",

packages/app/resource/locales/ja_JP/translation.json

@@ -460,6 +460,10 @@
     "enable_textlint": "Textlintを有効にする",
     "dont_ask_again": "常に許可する"
   },
+  "modal_resolve_conflict": {
+    "title": "衝突を解消する",
+    "resolve_and_save" : "解消し保存する"
+  },
   "link_edit": {
     "edit_link": "リンク編集",
     "set_link_and_label": "リンク情報",

packages/app/resource/locales/zh_CN/translation.json

@@ -438,6 +438,10 @@
     "enable_textlint": "启用Textlint",
     "dont_ask_again": "不要再问"
   },
+  "modal_resolve_conflict": {
+    "title": "解决冲突",
+    "resolve_and_save" : "解决冲突并保存"
+  },
   "link_edit": {
     "edit_link": "Edit Link",
     "set_link_and_label": "Set link and label",

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

@@ -55,7 +55,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
   return (
     <Modal isOpen={props.isOpen || false} toggle={onCancel} className="modal-gfm-cheatsheet">
       <ModalHeader tag="h4" toggle={onCancel} className="bg-primary text-light">
-        <i className="icon-fw icon-exclamation" />Resolve Conflict
+        <i className="icon-fw icon-exclamation" />{t('modal_resolve_conflict.title')}
       </ModalHeader>
       <ModalBody>
         <div ref={(el) => { setCodeMirrorRef(el) }}></div>
@@ -73,7 +73,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
           className="btn btn-outline-primary ml-3"
           onClick={onResolveConflict}
         >
-          {t('Done')}
+          {t('modal_resolve_conflict.resolve_and_save')}
         </button>
       </ModalFooter>
     </Modal>

packages/app/src/components/PageEditor/Editor.jsx

@@ -30,7 +30,8 @@ class Editor extends AbstractEditor {
       dropzoneActive: false,
       isUploading: false,
       isCheatsheetModalShown: false,
-      isConflictDiffModalOpen: false,
+      isConflictDiffModalOpen: true,
+      // isConflictDiffModalOpen: false,
     };
 
     this.getEditorSubstance = this.getEditorSubstance.bind(this);