Tesco and Unilever settle Marmite dispute