Fix typo
Small fixes to conflicts report