When a merge does not work automatically, git prevents