add dash.vim
fix conflict