Please spare us. China invaded Vietnam to protect Pol Pot while he was mass killing millions of innocent civilians. They have territorial disputes with over 10 countries, which they've been unable to decisively act on because those neighbors either have nukes (India) or are protected by a more powerful country (US). Not because their government is some benevolent entity. They're basically an authoritarian dictatorship that's kind of cornered at the moment (like Saddam after the Gulf War) but would kill a bunch of people and expand if the US wasn't around.

China has resolved a lot of its border disputes already. The border disputes with Kazakhstan, Krgyzstan, Laos, Mongolia, Nepal, North Korea, Russia, Vietnam, Tajikstan have all been resolved

They do it in the sea already. Just look at that nine dash line...