When is the conflict resolved
When you come to an understanding
At the end of the story or when you come to an understanding