Conflict Issues resolved