Update CHANGELOG.md
Update CHANGELOG.md
Update CHANGELOG.md
Attempting to solve conflict