oops, old version.
Fix combinatorics merge conflict