Representatives agreed to keep talking along the lines of the agreement reached in Geneva last month to temporarily lower tariffs.

Shortly after President Donald Trump returned to the White House in January, he launched a tariff war against China, as part of a broader implementation of import taxes on goods from several dozen countries as Trump seeks to reset the foundations of global trade.

Here are all the tariffs, counter-tariffs, dealmaking, and deal-breaking between the world’s two biggest economies.