added alias to edit files with conflict