Adding .vimrc
Merging troubles