Conflict Issues resolved.