# Conflicts: # OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java # OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java # OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java