BarrierOp
and Circuit._add_conditional_barrier
#988
Merged
BarrierOp
and Circuit._add_conditional_barrier
#988