Vin Diesel praises Dwayne ‘The Rock’ Johnson following end of feud