Fix the changelog after merge