resolve merge conflicts
resolve conflicts
fix update team - add btn modify for each team
fix conflict