merged two different .vimrc files