Fixing a bad merging.
Update CHANGELOG.md