Like taskmasker i suspect the trade war to simple continue and the likelihood of a "real" war to be quite slim. Though if we're talking in the next 50 years, then maybe more likely.
A lot of blame is being passed around right now, and both sides will try to act in self determination for as long as possible. Inevitable, the free trade will have to come back again because nobody likes to see prices of goods rise out of control when houses have un-affordable for decades.