Conflicts can arise from misunderstandings or from different viewpoints on how to solve an operational problem. Not all problems are due to personality conflicts. To address misunderstandings and differences of opinion, the best solution is to talk it out.
Conflicts from communication gaffes can be put to an end when the confusion with the message is clarified. Work-related differences will disappear when the problem is addressed or disappears on its own. In the meantime, don’t lose your temper.