I think having a one world government will actually have the opposite effect. Everyone would share the same identity and there will be free flow of people all around the globe which will lead to a lot of cultural mixing which, in a generation or two, create humans that don't discriminate each other because everyone share a single identity.