update CommuteAttribute model
fix merge conflict