Is SRK and Salman's fight finally over?

Shah Rukh's wife Gauri Khan attending Salman Khan's brother Sohail Khan's Diwali bash, set tongues wagging