Add various grammar changes to conflict error messages#9369

charliermarsh merged 1 commit intomainastral-sh/uv:mainfrom

charlie/plastral-sh/uv:charlie/plCopy head branch name to clipboard