update tc to theirs-conflict for backwards compat