resolved conflics