Xi Jinping seems to be making peace, but he can’t stop talking about war