Fixed merge error in Attribute