Update changelog for merge