Question

What nation, which is reportedly making preparations in case conflict breaks out on the korean peninsula, shares north korea's northern border?

Answer 1

china is the one you are looking for 

Answer 2

South Korea 

as the Korean War was never truly ended, it resulted in a stalemate.

China isn't really a threat to  N. Korea and China were allies in the Korean War and both share a communist government .