update CHANCES.rst
Resolve merge conflict in CHANGES.rst