Cannes holds out olive branch in row with Netflix