Conciliatory change in conflict theory