styled team page
resolved conflict