Merging changelog notes