update comments
merge