Small edit to conflicts.rst