linux mod vimrc
merge