Preparing for release
Merge conflict resolution
Update changelog and add UPGRADING.md