Facing some problems with this new story

I  follow this show though not regularly.. but since few days i couldnt catch up with it.. and now wen i watch todays epi i couldnt understand a single bit..

They took a 20 year leap. Daljeet and Fateh are both dead. Jeet is the son of Ranveer and Sahiba. Ashish is playing Jeet now. Ranuak is the son of Fateh and Sahiba.

Daljeet married another woman before the leap. They had a daughter Heer. Both Jeet and Ranuak are in love with Heer, but neither of them know they're both in love with the same girl. Raunak and Heer are engaged to be married and Jeet is upset about this.

ranveer, Daljeet and Fateh died. Even Daljeet's wife died. Fateh was Sahiba's(after she had memory loss and was in orphanage in name of Anu) another husband whose character was also played by Ashish. Ashish is now playing Jeet's character. Jeet is Ranveer- Sahiba's son and Ronak is Fateh-Sahiba's son. Daljeet's daughter is Heer who lives with her grandmother/Daljeet's mother. Heer is going to get married to Ronak. But this is a love triangle since Jeet also seems to love Heer.