Fixed teams.
Fixed merge.