Add Vim Polyglot syntax support
Fix merge conflicts