I mean it depends on what oyu mean by resolved . There was a kiss as a grand overture and "come after me, Jack" so it's clear they're on the same page. The third season really was they they're clearly on the same page but circumstances interrupting type situation. And then the movie coming out in February.