Edit with conflict editor command (Shell Action menu)
Use this command to edit selection with the conflitct editor.