Xi and Biden cool the heat, but China and the US are still on collision course