Typo fixes to conflicts.md