China Blinks on South Korea, Making Nice After a Year of Hostilities