Describe a time when you had to resolve conflict within a team. What was the outcome?