Text conflicts are now better about resolving conflicts that don't
overlap (git and search).