merge new editor.