Tesco confirms pricing row with Unilever has been settled