Changelog Upgrade
Fixed merge conflicts