cambio en el combo I just screwed that up

Do the merge