Yes, this is the entire reason behind the contemporary idea of the geographic border defining the political state. If we just hit “reset” after the war and all agree that states should embrace political sovereignty which isn’t tied to ethnic divisions, then slowly it will kind of all blur into one big quasi-federal good time.

This has actually worked decently well in most places, with some notable exceptions.