After months of an escalating trade war between the U.S. China, the two countries have declared a truce