Resolving a Conflict with a Colleague