Updated vimrc
Solve merge conflict