Columbia may be nearing a truce with Trump in funding fight