It's learnt that Bipasha walked into Salman's hotel room recently during the IIFA event where Salman was partying with his friends. Initially, Salman did not like Bips presence, but later the two spoke to each other and since then the cold war between the two has finally been laid to rest.
Salman's cold war with Bipasha started after he had a fall-out with John Abraham during one of the world tours. It must be mentioned that Salman and John are still not on talking terms. Hope Bips changes that too.