The CV's could have shown Jigar talking to Rashi where Rashi said thanks him for her gift again and asks for his forgiveness. Jigar says that he is still upset over the whole thing and while he hasn't forgiven her, he will try to work with her to make their relationship normal again. Also, he doesn't like Urmi but since he was brought up to respect his elders, so he will try to give her that respect even though his heart is not in it. Also, he could talk to Hetal about this and Hetal, being Hetal should tell him to forgive as she has already done that since she has seen Rashi trying to change (which we know she hasn't, but Hetal doesn't). An episode along those lines would have made more sense. Similarly, the could address hundreds of other unfinished stories they have created in the serial which we would all have likes and would have stretched the serial endlessly. Doesn't this make more sense?