fixes paths for merge