And thus letting bygones be bygones, Saif Ali Khan has decided to be friends again with his Cocktail heroine Deepika Padukone . In fact, we spotted the two actors chatting, hugging and generally having a whale of a time while shooting for the film's climax in Asiad Village, New Delhi.

For those who missed the big Race 2 controversy, here's a quick recap - Deepika dropped out of the film. Producer Ramesh Taurani declared war.

Meanwhile, her co-stars of the film including old buddy Saif (who she had worked with in Love Aaj Kal) started ignoring her. The actress finally gave in and decided to return to the project.

Though Taurani may still not be entirely happy with Dippy, her co-actor Saif has surely forgiven her. On Wednesday morning, Saif and Deepika shot for the climax scene for Homi Adajania's Cocktail in the national capital.

The actors along with their co-star Diana Penty were spotted in the open area behind Siri Fort Auditorium. The climax scene is also the last one being shot in the film and involved the characters of Diana, Deepika and Saif hugging.

We noticed that the chemistry shared by the trio in front of the camera did not diminish off it. In fact, the three were having so much fun on the sets (Deepika was even spotted enjoying some Delhi ke golguppe), that a single shot involving them took multiple retakes.

The sequence that involved two consecutive days of shoot (Tuesday and Wednesday), also had over a hundred junior artistes trying to create a busy city backdrop in the otherwise quiet Siri Fort area. After wrapping up the shoot, everybody was happy to fly back to aamchi Mumbai sans their hero Saif, who stayed on to promote his upcoming film Agent Vinod in the city.

Produced by Illuminati films, Cocktail will hit the theatres on July 13 (less)