diff --git a/developer-docs-site/docs/guides/resource-accounts/understanding-resource-accounts.md b/developer-docs-site/docs/guides/resource-accounts/understanding-resource-accounts.md
index 096625b7d6603..1ceb396239bea 100644
--- a/developer-docs-site/docs/guides/resource-accounts/understanding-resource-accounts.md
+++ b/developer-docs-site/docs/guides/resource-accounts/understanding-resource-accounts.md
@@ -3,6 +3,9 @@ title: "Conceptual understanding"
 id: "understanding-resource-accounts"
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 # Conceptual understanding
 
 ## What is a resource account?
diff --git a/developer-docs-site/sidebars.js b/developer-docs-site/sidebars.js
index d499196fce861..4a99a3a5362b9 100644
--- a/developer-docs-site/sidebars.js
+++ b/developer-docs-site/sidebars.js
@@ -336,11 +336,6 @@ const sidebars = {
     },
     {
       type: "category",
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 2cc005c6a5 (Updated inaccurate wording, explained the difference between account.move and resource_account.move, and moved the structure around. Also added auth key rotation examples from #9130 to refer to.)
       label: "Examples",
       collapsible: true,
       collapsed: true,
@@ -351,12 +346,6 @@ const sidebars = {
         slug: "/category/examples",
         keywords: ["examples"],
       },
-<<<<<<< HEAD
-      items: ["guides/account-management/key-rotation"],
-    },
-    {
-      type: "category",
-=======
       items: [
         "guides/account-management/key-rotation",
         {
@@ -374,8 +363,6 @@ const sidebars = {
     },
     {
       type: "category",
->>>>>>> 55c0f3ab0c (Updated inaccurate wording, explained the difference between account.move and resource_account.move, and moved the structure around. Also added auth key rotation examples from #9130 to refer to.)
->>>>>>> 2cc005c6a5 (Updated inaccurate wording, explained the difference between account.move and resource_account.move, and moved the structure around. Also added auth key rotation examples from #9130 to refer to.)
       label: "Build E2E Dapp with Aptos",
       link: { type: "doc", id: "tutorials/build-e2e-dapp/index" },
       collapsible: true,