Trump drops 25%tariff threat on columbia