tup-git: conflicts with tup