Fixing issue with Auto Merging teams