User blog comment:QuasimodoBellringer/Review: No One Eggspects the Spanish Opposition/@comment-1427230-20131016000653/@comment-24600224-20131016005013

If you watch the promo for Gwen and Courtnet, they fight against each other. They punch each other lifelessly, barely even tapping each other.

Beyond that, they apparantly continue to bond by talking about how much Duncan sucks, according to the synopsis.

It's pretty clear that they're both friends again.