Add unite-git-conflict