They're both. On the bed. At the same time!
Trixie has finally come around to where Ari was a few weeks ago (and, truthfully, where Ari still is). They won't allow Fiona to be friends with them yet (mainly because Fi thinks being friends is about dive-bombing from behind while one sleeps) but they're not full-on haters with each other anymore. Woo hoo!