update paths
merge