diff --git a/sidebar.ts b/sidebar.ts
index dc76e567..90557038 100644
--- a/sidebar.ts
+++ b/sidebar.ts
@@ -405,15 +405,7 @@ export const sidebar: SidebarEntry = [
       "articles/web-standard-apis",
       "articles/web-crypto-apis",
       "articles/cache",
-<<<<<<< HEAD:sidebar.ts
-      {
-        type: "link",
-        label: "Node Modules",
-        href: "/articles/node-modules",
-      },
-=======
       "articles/node-modules",
->>>>>>> c327246 (node modules):sidebar.json
       "articles/http-problems",
       "articles/reusing-code",
       "articles/zone-cache",