Merge branch 'develop/scripteditor-1' into pr-script-name-conflict-002

Author: cyfung1031

src/pages/options/routes/script/ScriptEditor.tsx

@@ -290,6 +290,7 @@ function ScriptEditor() {
           const modalResult = await new Promise((resolve) => {
             modal.confirm!({
               focusLock: false,
+              simple: false,
               closable: true,
               title: t("edit_conflict"),
               content: t("confirm_override_when_edit_conflict"),