That battle de-escalated quickly