message: Resolved merge conflicts and squashed into one commit
diff: @@ -136,10 +136,10 @@ def cond_v2(pred, true_fn, false_fn, name="cond"):
  # correct output structure
  tensors = tuple(array_ops.identity(t) for t in tensors)
  - result = tuple(tensors[:num_cond_outputs])
  - if len(result) == 1:
  - return result[0]
  - else:
  + # Packing output tensors in the same nested structure as the true and false
  + # functions return
  + result = nest.pack_sequence_as(structure=true_graph.structured_outputs,
  + flat_sequence=tensors[:num_cond_outputs])
  return result
  