fix changelog after merge conflicts