Improve grammar and readability of conflict errors