Why dont you two just "fuck and make up", while I watch of course.

You guys are way too much fun to hang out with for you to be pissed at each other.

New years party at my house, both of you are invited.

Matt