Update merge/merge-delay-error impls.

Split merge into merge/merge* for consistency with other functions that
can take one or more observables or observable of observables.
Updates from @mbossenbroek's feedback.