add gist-vim
fix conflict