Yes, the big patch up has happened. Karan Johar and Kajol, who accidentally bumped into each other at a recent function, are finally on good terms again. But it wasn?t sans any drama. In typical Dharma movie style, there was crying, hand holding and hugging. Followed by some much-needed laughing and giggling. Like they say, true love never dies.