If there is a merge conflict, don't bring up the editor