Remove `\/` from `merge`.

No longer force `merge` to return a disjunction with `Error`. We can
explicitly do that where we need one, but since `WorkflowOp.merge`
itself can no longer fail, we can now avoid `Error` in most uses.

Also toss the unused `mergeGroups` (@mossprescott removed all the call
sites when fixing #230).