That dispute was resolved earlier this week with a five-year suspension of tariffs on olive oil, cheese and whisky, as well as other products.