merge changelogs