Add unite-git-confilict.vim
Merge branch 'master' into mac