fixed paths
merge conflicts