Today was to make rules of engagement for fighting.
My personal rules are:
To use a soft tone, and keep my voice calm.
To not interrupt and really try and listen to the other side
To keep the fight on subject and to not bring other issues, past or present into the current issue.
I think these rules will help a lot.