Fixed get teams
fixed merge