Fixed typo in conflicts.rst