Managing Conflict (Comp Dev – Online Delivery)