reflect core changes of attrs
merge