updates paths and tweaks vim fold refreshing
merge conflict