A dispute or quarrel.
Colloquial: a quarrel, fight or squabble.
Peace, reconciliation or truce; the settlement of a conflict.