diff --git a/web-app/src/app/index.jsx b/web-app/src/app/index.jsx
index b45a5a9..1aee3d4 100644
--- a/web-app/src/app/index.jsx
+++ b/web-app/src/app/index.jsx
@@ -1,9 +1,5 @@
 import React from "react";
-<<<<<<< HEAD:src/app/index.jsx
-import ChatLayout from "../components/ui/ChatLayout";
-=======
-import ChatLayout from "src/components/layouts/chat-layout";
->>>>>>> cb9cff44215b6de81ed81ef2a1c6abe090fbf1b1:web-app/src/app/index.jsx
+import ChatLayout from "../components/layouts/chat-layout.jsx";
 
 function App() {
   return (
diff --git a/web-app/src/components/ui/chat/chat-header.jsx b/web-app/src/components/ui/chat/chat-header.jsx
index 603cb61..2952cc6 100644
--- a/web-app/src/components/ui/chat/chat-header.jsx
+++ b/web-app/src/components/ui/chat/chat-header.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import ActionButton from "./Button/ActionButton.jsx";
+import ActionButton from "../Button/ActionButton.jsx";
 
 export default function ChatHeader({ title = "AI Assistant" }) {
   // Delete chat log (frontend + backend)