Describe a situation where you had to resolve a conflict with a colleague. What was the outcome?