Is the trade war coming to an end - or will it continue?
Farmers have been desperate for a trade deal to be struck between the US and China. Some are even worried they may lose their farms if the international spat continues much longer.
President Trump spoke with reporters at the White House recently and said that he's looking forward to talking trade with China's President Xi at the G20 Summit - which begins today, and runs thru Saturday in Japan.
"I have a very good relationship with President Xi," Trump said. "We'll see what happens. I think we have a chance. China wants a deal. They don't like the tariffs."
He added that a meeting between the two leaders "might go well."
"Frankly our people are starting to deal as of tomorrow, the team is starting to deal," Trump said. "China would like to make the deal. We would like to make the deal but it has to be a good deal for everybody."
The President raised an existing 10 percent tax on many Chinese imports to 25 percent. China retaliated by adding higher tariffs on many American imports.