changed team page style
merging with remote
resolved the conflicts