Changed team_id => team_name
Fixed merge conflict