Tell me about a time when you had to resolve a conflict between two people

Tell me about a time when you had to resolve a conflict between two people. How did you approach the situation and what was the outcome?