so, how to solve conflict exactly? different people has different approach in handling their own conflict. the result of course varies from person to person.
there is no best way in solving your own conflict. Considering all the gathered facts, feelings and opinions about the conflict might helps. Or maybe making list of options to the problem, for example; considering possible positive and negative consequences of each. by doing that you have an idea from the option list which one of priority. Next maybe you could depersonalise the options to avoid focus on the personalities of those involved. Developing a consensus for the option that most resolves the conflict, even if it involves compromise also giving a hand or two.