Prettify vimrc
Resolve conflicts