Tough times

Well, the essential thing is to be able to keep the temper from flaring. I don't know if you guys got into any really messy arguments, but I find being able to keep myself from getting too emotional really helps to clear the air and get a grasp on the situation. You'll notice that it'll go both ways, as a person can't really keep shouting forever when the other person is calm and speaks in a normal manner. Also, if you have to share something in the other person's behavior which you don't like, be VERY careful of the way you say it, as a single misplaced word can bring about a whole lot of unnecessary fighting.

Getting the other person to talk about what it is exactly that is bothering them is also required. I don't know the person you speak of, but my experience so far has been that girls do have a tendency to get stuck on little things that they expect you to figure out by yourself and it can be hard at times to get these things to be put into the light. Behaving in the way I stated above certainly helps.

Jam it back in, in the dark.