select team on correct page
working on current user joining selected team
fix merge conflicts