I wonder what's really best / possible. Most teams / companies start up homogeneous to some extent. Also, there is plenty of conflicts possible even in a homogeneous team - it's just more clear that assholes are assholes and not just begaving like that because they're racists, homophobes etc.

On the other hand, they often go hand in hand, it's just that the racist will direct his aggressions against someone looking different from themselves if possible (but they're happy to select a random victim if they can't find one)