Beijing and Seoul's relationship has been testy since a U.S. anti-missile deployment, but that may soon change.