diff --git a/llm-fe/src/llm-fe/pages/AsyncDashboard2/AsyncDashboard2.tsx b/llm-fe/src/llm-fe/pages/AsyncDashboard2/AsyncDashboard2.tsx
index cad2f99..549fa6a 100644
--- a/llm-fe/src/llm-fe/pages/AsyncDashboard2/AsyncDashboard2.tsx
+++ b/llm-fe/src/llm-fe/pages/AsyncDashboard2/AsyncDashboard2.tsx
@@ -305,19 +305,4 @@ const AsyncDashboard2 = ({}): JSX.Element => {
   );
 };
 
-<<<<<<< HEAD
-
-        <DashboardWrapperLayout>
-          <AsyncDashboardInner />
-        </DashboardWrapperLayout>
-
-
-    )
-
-
-}
-
-export default AsyncDashboard2
-=======
 export default AsyncDashboard2;
->>>>>>> b24fbf2 (update button based on state)