The best steps would be to identify the source of the conflict, what the disagreement is about. You should try and establish a common goal between the two, breaking down any barriers that may cause more conflict. Then, you should agree in the best way to resolve the conflict. Both sides should acknowledge the agreed upon solution and determine which responsibilities each party should have in order to keep the conflict down.