vimrc - removing unnecessary bundles, using CtrlPBuffer
vimrc - resolving merge conflicts from server