I think there is goin to be a tuff competition between Huda, Raj and Abhi as to who'll win Naina's love. Here is A SOLUTION to this.
I think Naina shud frame some conditions for that.She'll declare this way,"I love only my Rajveer sir but if someone else or Raj himself wants to marry me, then he'll have to solve the mystery related to my bro's death. But ATTENTION PLEASE, I'll keep loving Raj but simultaneously keep taunting him for killing my bro."
Hehehe.!!!!How's this?