Update CHANGES.rst

resolve merge-conflict for pull-request