diff --git a/web-app/src/app/index.jsx b/web-app/src/app/index.jsx
index b45a5a9..9d0b576 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
 
 function App() {
   return (