Choose humour over anger
That’s something I’ve realised recently — approaching what a tense situation with humour makes it far likelier that you reach a resolution that both sides are okay with. You might very well be the aggrieved party but anger is contagious and corrosive.
Humour adds to the relationship while removing the bile. A simple choice but not an easy choice.