local update
local merge