adding git-theirs