Update changelog.md
Fixed merge conflict with develop