removed editorHelper conflictEditor code