Ok, so things seem to have settled now!
After Manoj Kumar's 'dhamki' of suing the makers of 'Om Shanti Om' if the scenes spoofing him are not removed, Shahrukh Khan, Farah Khan, Yash Chopra and Gauri Khan paid a visit to the legendary actor's house. Apologies followed and Manoj Kumar pronto hugged King Khan whose film now stands as the biggest money spinner of 2007 in two weeks flat.
Here is a visual proof that 'sab kuch theek-thaak hai'!