On the escalation and de-escalation of conflict