tabstop vimrc
update
resolve merging conflicting of vimrc