China, a key ally of North Korea, remains in conflict with Seoul, whose leader Kim Jong Un has increased rhetoric and military posturing this year.