update api
merge