remove TeamHelper from messed up merge conflict fix
remove TeamHelper from messed up merge conflict fix

snahelou/awx,snahelou/awx,wwitzel3/awx,snahelou/awx,wwitzel3/awx,wwitzel3/awx,wwitzel3/awx,snahelou/awx