At the very least it has solved it for China, and that is one key driving force of their moves in this area.

Whether that makes a global conflict more or less likely is an interesting question.