laptop re-merge s/p symlink re-do