fix paths
merge