fixed corner case of xOneOf, aaadded docs
fixed merge conflict in xFlatMap