Rational minds resolve conflict best.
Are you both Calm?
When we are in fight / flight / freeze mode and adrenaline is coursing through our body,
our rational mind takes a back seat.
This moment is never a good time to try and resolve conflict.
Sometimes we don't have a choice.
However, whenever it is even remotely possible, ensure all present are composed before interacting with each other.
Even if you are calm, make sure others are as well.
If need be, go to separate spaces until cooler heads prevail.
Regardless, do not let the cause of the conflict and the ensuing event go undiscussed.