Diwali this year was a patch up time for many Bollywood stars as they were ready to forgive and forget their past issues. While Shah Rukh Khan said that there was no personal angst or ego between him and Salman Khan, former flames Shilpa Shetty and Akshay Kumar found themselves at the same Diwali party with their spouses in tow.