fix for mounting network shares
solve merge conflicts
solve merge conflicts