U.S. and China still fighting over trade