fixed paths hopefully...
fix merge