Tether nodes now know their team id
Fixes merge conflict