Tariff talks and your Christmas list

Will the toymaker China and the US settle the tariff argument before holiday shopping?