I think it would be marvelous if all world leaders got together with an independent adjudicator and were forced to draw out who exactly owns what from this point onwards forever and ever.
Yeah yeah we know you claim ancestoral ownership from 200 years ago etc. etc. but you didn't give a shit till they found oil blah blah.
We're going to thrash out what's a fair acreage based on an agreed universal formula taking into account natural resources.
Then that's what you get. End of.
No changing your mind because someone finds some extra gold mines 20 years from now.
Plant a nuke in each territory. Someone starts an aggression the adjudicator blows em up.