Create EditTeam widget
Resolve conflict