Stocks up as trade tensions ease