Merge changelog