fix: fix changelog entries after merge