fix changelog after merge

No match.