Tell me of a time you had a conflict and how you resolved it.

A common interview question is to tell a time you had a conflict with a coworker and how you resolved it. After years of working, I've never experienced two people resolving personal conflict. In my experience, one person eventually leaves. I'm interested in stories where you expressed a personal issue, and it came to a positive resolution. Bonus points if it was with your boss.