That STINKS! Nothing like stress at work- where many of us spend the majority of our waking hours.

If at all possible, I would try to move past this and get back to a place where you can be civil to one another. I have always found keeping up the tension takes way more work/energy/emotion than just moving past it. Doesn't mean that you like her now, just that you can be civil.