Simplify zip and merge apis to a single variant each

As per discussion from #36, this aligns the `zip` and `merge` APIs with `combine`.