update by a 2
merge