resolved conflits