Modified .vimrc and/or .gvimrc
Merge remote-tracking branch 'origin/master'

Fetching remote changes
Modified .vimrc and/or .gvimrc