Fixed merge conflict with on-server changes
Can create a team, but it's not properly configured