How did the tariff conflict get resolved?

The tariff conflict was resolved through negotiations and compromises between the involved parties. This typically involves discussions to find a mutually acceptable solution that addresses the concerns of all parties involved in the conflict. Sometimes, concessions are made on both sides to reach a resolution.