'We're on the same team!'

Nothing makes an irritable mate feel like more of an jerk than, when things start getting heated, to remind him/her calmly that "Hey, we're on the same team." It's a very unifying statement and a real reminder to them that your mutual goal is still to make each other happy and that you want to be working TOGETHER as a team towards a resolution, not against one another.