update path
merge