I don't think there will be any confilict between Japan and Chin
Let's make this clear: China is a first level power--matched only by US and EU. Japan is a secondary country. Japan is not on the way of China anyway, and Japanese won't dream to invade China anymore. I don't see any possibilities and initiatives for these two countries to fight a bitter war with each other.
But we do see the gains of a AU(Asian Union)---China can share the leadership with Japan---but, at any rate, China is still going to be the dominant power in AU. With Asian Yuan in place, US dolor is practically gone as the dominant exchange currency and China won't have to buy any US treasury bonds anymore--this painful tax to China is also gone.