Has the tariff war ended?