in class update
merge