added a known working viminfo setting
fixed merge conflict