Added team page
Resolving conflicts