The cold war between Sanjay Leela Bhansali and Aishwarya Rai has finally come to an end.

The duo had parted ways, thanks to Salman Khan and Ash's turbulent relationship.

Things got to a head when Khan allegedly phoned Vivek Oberoi 41 times in a single night threatening to kill him.

Rai, who was then in hospital after an injury on the sets of Rajkumar Santoshi's Khakee, issued a statement that she would no longer star in any film opposite Khan. Soon after, Rai, who was to star with Khan in Bhansali's Bajirao Mastani, stormed out of the film.

Recently, the actress-director pair met up at Mumbai's Filmcity and sorted out their differences. According to timesofindia.com, Ash was addressing a press conference at the venue while Bhansali was shooting his film, Black.

Ash went over to meet her Hum Dil De Chuke Sanam and Devdas director and the two hugged and patched up.

Click here for More Features