Just in case you were wondering Dear One, the antidote to conflict is acceptance.

Complete and total acceptance.

Not approval.  Not agreement.  Not compromise.  Not settling.  Not accommodating.  Not pretending.  Not lying.  Not cheating. Not faking it.  And most definitely not resignation.

If you want to diffuse a conflict Dear One, accept what is, exactly as it is, for exactly what it is, as quickly as you possibly can.

And once you do, once you stop pushing, resisting, railing against what is, once you let go of the emotional charge that conflict brings to a situation, then, and only then, will you be in a position (a very powerful one actually) to make a thoughtful, rational, intentional, and heartfelt decision about what you are going to do next.