confilt resolved