The dynamics of conflict resolution