Besides China, what other countries saw fighting in this war