The dispute was settled without acrimony.

• 这场争论未剑拔弩张而获解决。