from conflict to resolution