The China-US tensions are not going to get better, and, in fact, will get worse as years go by. More and more nations will be forced to choose sides. It's not good and I'm not sure what a resolution even looks like.
replies(6):
Any long term resolution to the conflict has to involve the realization that China has had 100 bad years and now has a giant comeback. And that the US has had 60 good years but now large parts of it decline.
If it was not for china North Korea and possibly Pakistan would not have had nuclear weapons now. So no, it is not just in it's own borders.