Lenardo, watching episodes and mixing them with with his own fanfics.
They didn't resolve it at all. As they said, it was just a break in their break, and they are not back together. This shit is gonna keep on going. At this point, Castle should be asking himself if his wife is fucking shyzo...