update function fix
merge