If we understand the conflict and know why there is a conflict we can come up with a possible solution. I often work with three simple steps when I am trying to resolve a difficult situation:
What is the current situation?
What is it what I want to achieve?
How am I going to achieve that?
In my experience this approach works pretty well. You simply cannot ignore the history of a conflict, otherwise the odds are that you will come up with a solution that doesn’t match the actual problem.