Border security brawl seems near a serene resolution