This conflift should be resolved