PS: It also depends on the person and the circumstances as to what method you use to try and diffuse things.

Maybe buy her some flowers to make amends?

Also, don't take to heart the stuff said in arguments. It's said in anger.

Jo.