fix changelog after merge