Use union merge strategy for the changelog
Merge pull request #1149 from ayshih/changelog

Use union merge strategy for the changelog