Updated CHANGES.md
Fixed merge