I think...both? I'm still a little mixed up from that last big Shift that happened in the village, it changed my memories and now... Now I have doubts about my original feelings for my companion, and I still feel something for the one that my Shifted memories are based on.

It's very confusing...I don't even know if it counts as me being unfaithful since nothing was confirmed before I was brought here.