A trade war ends with Trump blinking