Fixed merge issues... fixes problem of opposite choice visibility