Merge with work vimrc