Diversity based on grouping people together has several drawbacks, among others that "us and them" is strongly connected to hostility and dehumanization. Discrimination is only possible when people are sorted into distinct groups rather than embracing that all humans have some uniformable traits that define everyone as human.

A "us and them" thinking is directly linked to our emotional reaction to security. Many (majority?) feel more insecure when isolated and surrounded by people they associated as "them", with the opposite feeling when surrounded by "us". "us and them" is involved in practically every war ever fought, and many conflict is resolved by having the distinction of "us and them" being erased, rather then embrace how different "them" are and later embrace it.

I would like to think that society can truely embrace how similar people are and start to perceive everyone as belong to "us".