Shahrukh, Salman ends clash; Raees to be released with ‘Kaabil’