merge team stuff