Fix typeMerge for scalar op vector types.