Updated to ignore vim/vim/plugged
Updated!
fixed merge conflict