service request flow
resolved conflicts