add unite-git-conflict