Have Salman Khan and Govinda patched up?

Well with the recent developments, it seems like the rivalry between Salman Khan and Govinda is now over!It looks like Salman is on a forgiving spree. After hugging Shahrukh Khan at an iftar party, he has now approached Govinda to be a part of Hero remake. featurednews