It's less "meritocracy vs. diversity" and more "meritocracy factors in diversity."

They aren't opposed goals; an organization with a meritocracy that over-optimizes on too few metrics is fragile and collapses in a dynamic market.