diff --git a/src/layouts/rightRender.tsx b/src/layouts/rightRender.tsx
index 8637f8f2..333521d7 100644
--- a/src/layouts/rightRender.tsx
+++ b/src/layouts/rightRender.tsx
@@ -108,10 +108,6 @@ export const getRightRenderContent = (opts: {
       : 'user-menu-container',
     mode: 'vertical',
     expandIcon: false,
-<<<<<<< HEAD
-    // inlineCollapsed: collapsed,
-=======
->>>>>>> 7174170 (refactor: playground rerank layout)
     triggerSubMenuAction: 'hover',
     items: [
       {