BlackRock ends diversity goals, merges DEI staff into new team | Fortune