fix: merge conflicts

src/components/SEO.js

@@ -10,6 +10,11 @@ const METADATA = [
   },
 ];
 
+// List of urls we don't want to have indexed by Swifttype or search engines
+const DO_NOT_INDEX = [
+  'docs/licenses/license-information/usage-plans/archived-add-on',
+];
+
 const surveyRecaptcha = (
   <script
     key="google-recaptcha"
@@ -29,8 +34,15 @@ const isAgileHandbookPage = (url) => {
 
 const isMdxTestPage = (url) => url.includes('docs/mdx-test-page');
 
-const isExcludedFromSwiftype = (url) =>
-  isStyleGuidePage(url) || isAgileHandbookPage(url) || isMdxTestPage(url);
+const doNotIndex = (url, arr) => {
+  return arr.some((item) => url.includes(item));
+};
+
+const isExcludedFromIndexing = (url) =>
+  isStyleGuidePage(url) ||
+  isAgileHandbookPage(url) ||
+  isMdxTestPage(url) ||
+  doNotIndex(url, DO_NOT_INDEX);
 
 const DocsSiteSeo = ({
   location,
@@ -77,8 +89,8 @@ const DocsSiteSeo = ({
       />
     )}
 
-    {isExcludedFromSwiftype(location.pathname) && (
-      <meta name="st:robots" content="noindex, nofollow" />
+    {isExcludedFromIndexing(location.pathname) && (
+      <meta name="robots" content="noindex, nofollow" />
     )}
 
     {(description || title) && (

src/content/docs/accounts/accounts-billing/account-setup/choose-your-data-center.mdx

@@ -53,10 +53,7 @@ Costs for data ingest are dependent on your data center region. For details, see
 ## Cross-region accounts [#account-structure]
 
 When you sign up for New Relic, a [New Relic organization](/docs/accounts/accounts-billing/account-structure/new-relic-account-structure/#organization-accounts) is created. This is what contains all your accounts and data. When creating an organization, you must specify the data center region.
-By default, a New Relic organization and its accounts can only be in a single data center region. However, some customers with [partnership account structures](/docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/partnership-accounts-users-subscriptions#partnerships) can have accounts in both regions. Some details for customers with accounts in both regions:
-
-* Prior to October, 2022, organizations with accounts in both regions were only billed for the usage from US region accounts. Starting in mid October, 2022, these organizations will be billed for usage in both regions. The usage UI doesn't show data ingest from across data center regions: it shows only the ingest for the current account you're in and any of its [child accounts](/docs/accounts/original-accounts-billing/original-users-roles/mastersub-account-structure).
-* The top-level account for your entire partnership organization resides in a single region. When you view the usage for that account, you'll see only the data usage from the accounts in that region. To view usage for the other data center region, switch to any [parent accounts](/docs/accounts/original-accounts-billing/original-users-roles/mastersub-account-structure) in the other region and view the usage UI for those accounts.
+By default, a New Relic organization and its accounts can only be in a single data center region. 
 
 ## Create an EU region organization [#create-eu-account]
 
@@ -252,7 +249,7 @@ New Relic's [account billing process and pricing options](/docs/accounts/account
 
 New Relic may access and process Customer Data in the United States and such other jurisdictions where New Relic has affiliates and subsidiaries, including as may be necessary to maintain, secure, or perform the services, to provide technical support, or as necessary to comply with law or a binding order of a government body.
 
-Customer Data from existing New Relic accounts cannot be transferred or shared across regions, and new data generated cannot be shared with existing accounts, even in [partnership accounts](#global-account-hierarchy).
+Customer Data from existing New Relic accounts cannot be transferred or shared across regions, and new data generated cannot be shared with existing accounts.
 
 ## Verify your account is based in EU region [#verifying-account]
 

src/content/docs/accounts/accounts-billing/account-structure/add-accounts.mdx

@@ -27,7 +27,7 @@ For reasons to add accounts, see [Organization and account structure](/docs/acco
 
 ## Add accounts [#add-accounts]
 
-To add an account from the UI: from the [<DNT>**Access management**</DNT> UI page](https://one.newrelic.com/admin-portal/organizations/organization-detail), click <DNT>**Accounts**</DNT>, and then click <DNT>**Create account**</DNT>. (If you're on our original user model, see [Add accounts](/docs/accounts/original-accounts-billing/original-users-roles/parent-child-account-structure/#creating).)
+To add an account from the UI: from the [<DNT>**Access management**</DNT> UI page](https://one.newrelic.com/admin-portal/organizations/organization-detail), click <DNT>**Accounts**</DNT>, and then click <DNT>**Create account**</DNT>. 
 
 To add an account via API: see [Manage accounts with NerdGraph](/docs/apis/nerdgraph/examples/manage-accounts-nerdgraph).
 

src/content/docs/accounts/accounts-billing/account-structure/factors-affecting-access-features-data.mdx

@@ -36,10 +36,7 @@ Your [user type](/docs/accounts/accounts-billing/new-relic-one-user-management/u
 
 ### Assigned roles [#roles]
 
-Your assigned roles can affect what you can access. How your user roles and permissions work depends on which [user model](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-user-models) you're on:
-
-* Our newer user model: [learn about user access](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-concepts/#understand-concepts).
-* Our original user model: [learn about user access](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model/#roles).
+To learn more about assigned roles, see [How groups and roles control access to New Relic](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-concepts/#understand-concepts).
 
 ### Pricing edition [#pricing]
 
@@ -59,12 +56,11 @@ If you're logged in but can't find an expected account or UI page, it may be bec
 
 * If your organization has multiple accounts and you have access to those accounts, you can switch to another account by using the [account switcher](/docs/new-relic-solutions/get-started/glossary/#account-switcher).
 * If you have multiple user records (for example, access to more than one New Relic organization), you can [switch between your user records](/docs/accounts/accounts-billing/account-setup/multiple-logins-found).
-* If you can't find an expected account, it may be because you haven't been assigned access to that account. See [user permissions issues](#user-permissions).
+* If you can't find an expected account, it may be because you haven't been assigned access to that account. See [user permissions issues](#user-permissions)  for more information.
 * If you check the account switcher and can't see the account you're looking for, it may be for one of these reasons:
-  * You may need to be added to that account. How you do this depends on your user model: [Our newer user model](/docs/accounts/accounts-billing/account-structure/new-relic-account-structure/#account-access) \| [Our original user model](/docs/accounts/original-accounts-billing/original-users-roles/original-account-structure).
+  * You may need an administrator to add you to the account. See [How users access accounts](/docs/accounts/accounts-billing/account-structure/new-relic-account-structure/#account-access).
   * You may have more than one New Relic login associated with the same email address. If you think this may be the case, log out and log back in. When you input your email address, the login UI displays a note if it detects multiple user records and gives you [an option for verifying your email to see all available accounts](/docs/accounts/accounts-billing/account-setup/multiple-logins-found). Other details about multiple logins:
     * To see all your available login options the next time you log in, select <DNT>**Remember me**</DNT> when logging in.
-    * If one of your login options reads "Original account", that means it's a user record on our [original user model](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-user-models).
     * For more information, see this [Support Forum post about multiple accounts](https://discuss.newrelic.com/t/relic-solution-so-youve-created-a-new-account-and-cant-seem-to-access-your-old-account/113122).
 
 Other related docs:

src/content/docs/accounts/accounts-billing/account-structure/multi-tenancy/intro-to-multi-tenancy.mdx

@@ -1,6 +1,37 @@
 ---
 title: "Introduction to multi-tenancy" 
 metaDescription: "The multi-tenancy feature helps you manage multiple organizations and accounts"
+redirects:
+  - /docs/accounts/original-accounts-billing/original-users-roles/parent-child-account-structure
+  - /docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/partnership-accounts-users-subscriptions
+  - /docs/new-relic-partnerships/partner-integration-guide/getting-started/partner-integration-requirements
+  - /docs/new-relic-partnerships/partner-integration-guide/getting-started/partners-contact-new-relic
+  - /docs/new-relic-partnerships/partner-integration-guide/getting-started/co-branding-new-relic-partners
+  - /docs/new-relic-partnerships/partner-integration-guide/getting-started/partnership-admin-console
+  - /docs/new-relic-partnerships/partner-integration-guide/getting-started/support-resources-new-relic-partners
+  - /docs/new-relic-partnerships/partner-integration-guide/getting-started/walkthrough-signoff
+  - /docs/new-relic-partnerships/partnerships/getting-started/using-partner-portal
+  - /docs/new-relic-partnerships/partnerships/getting-started/partner-marketing
+  - /docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/partner-account-access-administrators
+  - /docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/restricted-access-partnerships
+  - /docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/welcome-messages-partnerships
+  - /docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/staging-production
+  - /docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/tips-tricks
+  - /docs/new-relic-partnerships/partner-integration-guide/new-relic-products-features/partner-products-pricing-billing
+  - /docs/new-relic-partnerships/partner-integration-guide/new-relic-products-features/single-sign-access-control
+  - /docs/new-relic-partnerships/partner-integration-guide/new-relic-products-features/other-partnership-settings
+  - /docs/new-relic-partnerships/partner-integration-guide/appendix/version-history
+  - /docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/partner-api
+  - /docs/new-relic-partnerships/partnerships/partner-api/partner-api-reference
+  - /docs/new-relic-partnerships/partnerships/partner-api/partnership-api-keys
+  - /docs/new-relic-partnerships/partnerships/partner-api/typical-integration-example
+  - /docs/new-relic-partnerships/partnerships/partner-api/partnership-api-account-object
+  - /docs/new-relic-partnerships/partnerships/partner-api/partnership-api-sub-account-object
+  - /docs/new-relic-partnerships/partnerships/partner-api/partnership-api-user-object
+  - /docs/new-relic-partnerships/partnerships/partner-api/partnership-api-subscription-object
+  - /docs/new-relic-partnerships/partnerships/partner-api/partnership-billing-integration-api
+  - /docs/new-relic-partnerships/partnerships/partner-api/product-buckets
+  - /docs/apis/nerdgraph/tutorials/provisions-your-subscriptions-nerdgraph
 freshnessValidatedDate: 2024-09-05
 ---
 

src/content/docs/accounts/accounts-billing/account-structure/new-relic-account-structure.mdx

@@ -47,6 +47,4 @@ Note that some features, like <InlinePopover type="dashboards"/> and workloads,
 
 To learn more about access issues, see [Factors affecting access](/docs/accounts/accounts-billing/account-structure/factors-affecting-access-features-data/).
 
-## Original user model [#original-model]
 
-If your users are still on our original user model, the account structure and access works differently: see [Original user model account access](/docs/accounts/original-accounts-billing/original-users-roles/original-account-structure).

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-billing/add-on-billing.mdx

@@ -14,7 +14,7 @@ In addition to the primary billing factors of GB Ingested and billable users, yo
 * **Advanced Compute (formerly Add-on Compute)**: This add-on applies to usage-based billing for actions you run related to Codestream, Live Archives, and other features as made available. You are measured and billed based on your usage of [Advanced CCUs](/docs/licenses/license-information/product-definitions/new-relic-one-pricing-definitions/#compute-capacity-unit).
 
   <Callout variant="tip"> 
-    Your use of CodeStream under Advanced Compute will incur CCU charges, regardless of user type. This means that even free Basic users can now access CodeStream at a very low monthly cost of just the Advanced CCUs.
+    Your use of CodeStream under Advanced Compute will incur CCU charges, regardless of user type. This means that free basic users can access Advanced Compute features and incur charges for Advanced CCUs.
   </Callout>
 * **EU Data Center for Original Data or Data Plus**: This add-on applies to your data option (original Data or Data Plus) when you select the European Union as your data region, as available.
 * **Extended Retention for Original Data or Data Plus**: This add-on applies if you exceed the default length of time your data is retained. This applies to all your data—not just logs—and is a good option if you need to make a lot of small queries or make queries on large volumes of data.

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing.mdx

@@ -16,7 +16,7 @@ redirects:
   - /docs/licenses/license-information/faq/frequently-asked-questions
   - /docs/accounts/accounts-billing/new-relic-one-pricing-billing/billing-ui
   - /docs/accounts/accounts-billing/general-account-settings/introduction-account-settings
-freshnessValidatedDate: 2024-10-23
+freshnessValidatedDate: 2024-11-08
 ---
 
 Whether you're thinking about using New Relic or are already sending telemetry to our platform, it's good for you to understand how the business side of New Relic works. 
@@ -29,10 +29,6 @@ We offer a variety of options in our pricing model, editions, and buying program
   src="/images/accounts_diagram_pricing-diagram.webp"
 />
 
-<Callout variant="tip">
-  Some older New Relic customers are on our original pricing model. For more on that, see [Pricing models](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-pricing-models).
-</Callout>
-
 ## Pricing model [#pricing-model]
 
 Our usage-based pricing model is composed of three factors that could affect your bill. Some factors are optional, so what you pay depends on which options you choose.
@@ -145,7 +141,7 @@ Here's another example of an order item:
 New Relic - Pro Full Platform Users (PAYG)
 ```
 
-The `PAYG` at the end means your organization is on our pay-as-you-go [buying program](#usage-plans).
+"PAYG" at the end means your organization is on our pay-as-you-go [buying program](#usage-plans).
 
 For more details about order terms, see our [license docs](/docs/licenses/license-information/usage-plans/new-relic-one-usage-plan-descriptions).