The beef is finally squashed. But just when you think it’s all good, the tension ramps back up… Meanwhile, the “dirty stay outs” take over San Diego.