SRK, Farah hug and make up!

Friendship turned sour for Shah Rukh Khan and Farah Khan when the latter's Tees Maar Khan went the 'khiladi' way and treaded on the forbidden. But Apsara Awards and the King's heartfelt apology on Koffee With Karan brought the two back together. All's well that ends well!

It's not unusual in Bollywood, many stars who didn't see eye to eye at one point of time, have buried the hatchet. Here's a look…

Priyanka-Kareena: The Priyanka - Kareena's infamous spat came to an end recently when the two lovely ladies hugged and made up at the Umang 2011 celebrations in Mumbai.

Aamir-Shah Rukh: Both Aamir Khan and Shah Rukh Khan never left any opportunity to look down upon each other. But the two were spotted hugging each other at the premiere of 3 Idiots.

Aamir–Salman: Since the days of Andaz Apna Apna Salman Khan and Aamir Khan were at loggerheads with each other. The two have sorted out their differences now.

Shah Rukh-Amitabh: The cold war between the two superstars seemed like a never ending one, but SRK extended an olive branch to Big B by attending the premiere of Drona.

Aishwarya-Kareena: After Karisma and Abhishek called off their engagement and Ash stepped into Aby baby's life, Kareena and Ash would not see each other eye to eye. But things changed for the better between the two and they were spotted talking to each other at Karan Johar's party.

Sanjay Dutt-Akshay Kumar: They ended their 15-year-old enmity on the sets of the movie Blue. Way back in 1994, Sanjay Dutt and Akshay Kumar faught over a song in the movie Amaanat and never spoke to each other.

Vivek-Abhishek: Vivek Oberoi's affair with Aishwarya Rai was the reason behind him sharing a cold vibe with Abhishek. But the two made up at filmmaker Apoorva Lakhia's birthday party.

Rekha-Jaya Bachchan: We don't need to specify why things were not well between Rekha and Jaya Bachchan. Recently at the launch of Gautama Rajadhyaksha's Marathi coffee table book Chehre, Rekha went ahead and hugged Jaya Bachchan.

Bipasha-Kareena: Things went sour between Bipasha and Kareena when Kareena called John Abraham expressionless at one of the talk shows. They ended their seven-year-old spat at Saif Ali Khan's birthday party.

Kareena Kapoor-Hrithik Roshan: The two worked together in Yaadein, Kabhie Khushi Kabhi Gham and Main Prem Ki Deewani Hoon which led to the rumours of their romance. Kareena Kapoor and Hrithik Roshan had parted ways then. Gradually things improved between the two when Kareena turned up for Hrithik Roshan's bash.

Salman-Hrithik: Salman Khan and Hrithik Roshan engaged in a war of words over Sanjay Leela Bhansali's Guzaarish. But Sohail Khan's birthday party brought them together as they were spotted hugging each other.

Rishi-Karan Johar: Actress Deepika Padukone made some unpleasant remarks about Ranbir Kapoor on Koffee With Karan. This angered father Rishi Kapoor and he criticised the host of the show KJo.

Salman-Katrina: The two love-birds had broken-up and patched-up several times in past. Of late, they even spoke openly about their singe status. There were reports of cold war between the two, but recently they came together to entertain the audience on the reality show Bigg Boss, that's not all Katrina was also spotted leaving Salman Khan's residence recently.

Salman- Govinda: Grapevine had it that Govinda was upset with Salman Khan because the latter didn't offer any help in launching Govind'a daughter's career in Bollywood. But the two have patched up now and will be seen together in Partner 2.