First, I'd like to suggest to keep discussions to a different thread.
And as second, just stop moving teams in and out, fix the brackets and let it pan out.
You can then start to avoid these problems properly the next time (if there will be a next time).