The person responsible for the patch up was Subhash Ghai, who hosted a party on Saturday night. Shahrukh arrived early for the party and was with Karan Johar and friends in one of the private sections. He took Sunny to the private section, headed straight to Shahrukh and reintroduced them.
The actors shook hands and ended up chatting for a long time as if nothing had happened in the past. Sunny left the party early while Shahrukh's friends gather to celebrate his wedding anniversary when the clock struck midnight.
All is well that ends well!