Fix typo in Conflicts