diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index b2b924a..9b04e27 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -8,14 +8,7 @@ const rootElement = document.getElementById('root') as HTMLElement;
 const root = ReactDOM.createRoot(rootElement);
 
 root.render(
-<<<<<<< HEAD
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>
-);
-=======
     <React.StrictMode>
         <App />
     </React.StrictMode>,
 );
->>>>>>> 432cea1 (initialisation tailwind)