Strip everyone of their identity/nationality IMO. Until we're all one race, or one nation, or what have you, there will never be anything close to peace on earth. It would be nice if we came up with a way to have everyone live inside identical robots, so there's no such thing as race or nationality or difference of any sort.