The tariff row is further indication that he is quick to quarrel but also quick to settle