Small performer label fixes
Resolving conflicts
Resolving conflicts2