update merge

update merge