Have Salman Khan and Katrina Kaif sorted out their differences?