Is the trade war now over? Now that the two sides have blinked, can globalisation continue more or less as it had before?