resolve trade tensions