Fixup previously commited collisions.