git-tf: remove conflicts with