Remove DS.AttributeChange.
fix merge conflicts