Attribute Conflicts Fix