Teams display and such
Merged conflicts