Well, hopefully they would have reconciled by then, yes. It would be awkward if they were still trying to kill each other. Also, hopefully Ye Zun doesn't have too much of a snit about them being half Haixingren so they have at least some extended family outside of Shen Wei and Zhao Yunlan.

*sulks* It's not my fault they sound the same. :( But also, he can have both. Both is good. >.>