resolved a conflict