fix conflict file CHANGELOG.md