master

Team resolver feature implementation