diff --git a/docs/content/advanced/backend/taxes/inclusive-pricing.md b/docs/content/advanced/backend/taxes/inclusive-pricing.md
index 4dea71bb7..7d1c3f21d 100644
--- a/docs/content/advanced/backend/taxes/inclusive-pricing.md
+++ b/docs/content/advanced/backend/taxes/inclusive-pricing.md
@@ -4,12 +4,7 @@ In this document, you’ll learn how tax-inclusive pricing works in Medusa.
 
 :::note
 
-Tax Inclusive Pricing is currently in beta mode and guarded by a feature flag. To use Tax-Inclusive Pricing either:
-
-1. Enable the `MEDUSA_FF_TAX_INCLUSIVE_PRICING` environment variable;
-2. Or enable the `tax_inclusive_pricing` key in the Medusa server's settings.
-
-You can learn more about enabling it in the [feature flags](../feature-flags/toggle.md) documentation.
+Tax Inclusive Pricing is currently in beta mode and guarded by a feature flag. To enable it, set the environment variable `MEDUSA_FF_TAX_INCLUSIVE_PRICING` to `true`, and [run migrations](../migrations/index.md#run-migration).
 
 :::
 
@@ -21,6 +16,7 @@ This can be useful when some countries have the same currency but have different
 
 Then, Medusa handles calculating the tax amount using the tax rate and the tax-inclusive price. This is managed in the backend and relayed to accounting and analytics tools.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 ## How is Tax Inclusivity Defined
@@ -30,6 +26,9 @@ Then, Medusa handles calculating the tax amount using the tax rate and the tax-i
 =======
 ## How is Tax Inclusivity Defined
 >>>>>>> 59a785c80 (docs: integrate Vale for documentation linting (#2242))
+=======
+## How is Tax Inclusivity Defined?
+>>>>>>> 853259989 (docs for tax-inclusive pricing (#2159))
 
 Tax inclusivity can be toggled for regions, currencies, price lists, and shipping options either during creation or while editing. This is represented by the boolean attribute `includes_tax` available in the entities `Region`, `Currency`, `PriceList`, and `ShippingOption`. By default, this attribute is set to `false`.
 
@@ -37,6 +36,7 @@ If you want to enable or disable this attribute for any of these entities, you c
 
 The value set for these entities can affect whether line items and shipping methods are tax inclusive or not.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 ### How is Tax Inclusivity Defined for Line Items
@@ -46,6 +46,9 @@ The value set for these entities can affect whether line items and shipping meth
 =======
 ### How is Tax Inclusivity Defined for Line Items
 >>>>>>> 59a785c80 (docs: integrate Vale for documentation linting (#2242))
+=======
+### How is Tax Inclusivity Defined for Line Items?
+>>>>>>> 853259989 (docs for tax-inclusive pricing (#2159))
 
 :::info
 
@@ -60,6 +63,7 @@ The `LineItem` entity also has the `includes_tax` attribute. The value of this f
 - Or a price list that includes the product variant associated with the line item has the `includes_tax` attribute set to `true`, and the tax-inclusive amount of one of the variant’s prices in the price list is less than the original price of the variant;
 - Or one of the variant’s prices in the price list uses a currency or region that has the `includes_tax` attribute set to `true`, and the tax-inclusive amount of the price is less than the original price of the variant.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 ### How is Tax Inclusivity Defined for Shipping Methods
@@ -69,6 +73,9 @@ The `LineItem` entity also has the `includes_tax` attribute. The value of this f
 =======
 ### How is Tax Inclusivity Defined for Shipping Methods
 >>>>>>> 59a785c80 (docs: integrate Vale for documentation linting (#2242))
+=======
+### How is Tax Inclusivity Defined for Shipping Methods?
+>>>>>>> 853259989 (docs for tax-inclusive pricing (#2159))
 
 :::info
 
diff --git a/docs/content/advanced/backend/taxes/manual-calculation.md b/docs/content/advanced/backend/taxes/manual-calculation.md
index 1c9c26f1b..027218df8 100644
--- a/docs/content/advanced/backend/taxes/manual-calculation.md
+++ b/docs/content/advanced/backend/taxes/manual-calculation.md
@@ -8,7 +8,7 @@ By default, taxes are automatically calculated by Medusa during checkout. This b
 
 If you disable this behavior, you must manually trigger taxes calculation. When taxes are calculated, this means that requests will be sent to the tax provider to retrieve the tax rates.
 
-## How to Manually Calculate Taxes in Checkout
+## How to Manually Calculate Taxes in Checkout?
 
 This section explores different ways you can calculate taxes based on your purpose.
 
diff --git a/www/docs/sidebars.js b/www/docs/sidebars.js
index d19a20cf3..6954014c9 100644
--- a/www/docs/sidebars.js
+++ b/www/docs/sidebars.js
@@ -296,8 +296,20 @@ module.exports = {
           label: "Create Batch Job Strategy",
         },
         {
-          type: "doc",
-          id: "advanced/backend/batch-jobs/customize-import",
+          type: "category",
+          label: "Admin",
+          items: [
+            {
+              type: "doc",
+              id: "advanced/admin/import-products",
+              label: "Import Products"
+            },
+            {
+              type: "doc",
+              id: "advanced/backend/taxes/manual-calculation",
+              label: "Calculate Taxes Manually"
+            },
+          ]
         },
         {
           type: "doc",