Japan and China said Friday they have reached a deal toward resolving their disputes over the discharge of treated radioactive wastewater from the tsunami-hit Fukushima Daiichi nuclear power plant into the sea and Beijing’s ban on Japanese seafood.

China and Japan reached a consensus in August on the discharge of radioactive water from the Fukushima nuclear plant, the Chinese foreign ministry said on Friday, bringing to an end a diplomatic dispute that had rumbled on for over two years.

The competent departments of China and Japan have recently conducted multiple rounds of consultations on the discharge of nuclear-contaminated water from the Fukushima Daiichi Nuclear Power Station into the ocean,