First of all, Heer is NOT getting married! I saw the episode, and I know that it's just a trick. They won't introduce a track like this, because the wedding is in 3 days. Also, Jay's cameo is with Panchi, so clearly he's getting married to Panchi NOT Heer.
I do agree that we should stop getting divided. In my opinion, they both made mistakes, but they are STILL one!