Tensions will likely heat up again at some point, but the current solutions on the table are better than a trade war.
