Sure shot way of resolving any conflicts, in these 3 steps:
1. Listening to understand the conflict.
2. Put your ego aside to find a solution.
3. Once decided take the path to solve, however challenging it may be.
Follow this and you can resolve any conflict in life.