... in which Japan finds a solution to the question of the Senkaku Islands
Click comic to ENLARGE.
Japan-China relations have been (literally) on the rocks for several weeks following the arrest of a Chinese fishing boat captain after he rammed his trawler into a pair of Japanese patrol boats near the Senkaku islands, a group of eight uninhabited islands in the East China Sea that are claimed by both countries (plus Taiwan). Complicating things further, China claims the islands belong to Taiwan, which it also claims, though that claim is disputed by ... the government and citizens of Taiwan.
The Guardian's Justin McCurry provides background here, here and here.
Wikipedia's overview of the issue is here.