merging changelog changes