Merge errors, idk

Workly/src/App.tsx

-<<<<<<< HEAD
 import { useState } from 'react'
 import './App.css'
 
 function App() {
-=======
 import Navbar from './components/Navbar';
 import AppRoutes from './routes/AppRoutes';
->>>>>>> 62b7ffd3898aa926db6b900000663fe0713087ba
 
 const App = () => {
   return (
     <>
-<<<<<<< HEAD
       <div className="Header">
         <a href="/" className='Title'>WORKLY.</a>
         <ul>
@@ -39,10 +35,8 @@ const App = () => {
         </div>
         <div className="Con3"></div>
       </div>
-=======
       <Navbar />
       <AppRoutes />
->>>>>>> 62b7ffd3898aa926db6b900000663fe0713087ba
     </>
   );
 };