Now aborting on merge conflict