Board Thread:Spoilers!/@comment-6175354-20141215234519/@comment-24674051-20150102145907

And, if they were to bring Neal back (which I highly doubt), I really don't see that as adding tension to the CS relationship. Neal pretty much told Emma to find love again when he died. And given the final state of Neal and Killian's relationship, I see Neal as being happy it's his friend that is bringing happiness to Emma. The only tension that I would see is the bachelor party that Neal (as the Best Man) would throw for Killian right before the wedding.