Fix conflict CHANGELOG.md