Add unite-git-files-conflict

http://this.aereal.org/entry/2013/12/25/003235