Hidden conflict problems resolved