Amitabh Bachchan and Salman Khan seem to have ended their cold war, according to sources from the sets of God Tussi Great Ho being shot currently in Mumbai's Film City.

The film is the directorial debut of write Rumi Jafferey and is being produced by Afzal Khan. God Tussi Great Ho has been in the making for almost two years now. It seems that after the Abhishek Bachchan-Aishwarya Rai wedding, there were cold vibes between the Big B and Salman. However, matters seem to have returned back to normal now. Everybody on the sets was surprised to see the Big B and Salman behaving like old pals, when the shooting began this week. Initially, the two actors would ignore each other and disappear into their respective vans once a shot was over. But now the actors are seen laughing and sitting together in either of the vanity vans in between shots. Recently, there was comic scene being shot between the Big B and Salman and the latter found it very difficult to get his timing right. But the Big B continued to maintain his cool and once Salman got the short right, he is believed to have hugged him, much to the surprise of onlookers. The new-found friendship has come as a huge relief to the producer who having a tough time getting joint dates from both the stars. God Tussi Great Ho is based on the Hollywood flick Bruce Almighty starring Jim Carrey and Moragn Freeman, with Salman playing Carrey's part and Amitabh stepping into Freeman's part, playing God. The film also stars Priyanka Chopra.