SRK, Farah Khan patch up