Simplify conflict error message wording