Salman Khan once thought he would never patch up with Shah Rukh after fight at Katrina’s birthday