Has the US made peace with the rise of China?