First, congratulations on your promotion! I like this the best: "there was some tension (without saying who) and that we worked through it." Do take notes of what has been going on, though. The key is to keep calm, although I think it must be very difficult.

Good luck!