diff --git a/client/src/index.js b/client/src/index.js
index b763b62..8cb384e 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -1,13 +1,6 @@
-<<<<<<< HEAD
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
 
 ReactDOM.render(<App />, document.getElementById('root'));
-=======
-import React from "react";
-import ReactDOM from "react-dom/client";
-import App from "./App";
-const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render(<App />);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+