Has Kangana ended her spat with Karan Johar for good?