Removed rebase error from change log
Merge pull request #3433 from edx/ahodges/documentation/changelog

Removed rebase error from change log