Resolving erros with team