fixed header

src/components/Header.jsx

@@ -1,6 +1,5 @@
 import { Link } from "react-router-dom";
 const Header = () => {
-<<<<<<< HEAD
   return (
     <header>
       <h1>
@@ -23,14 +22,5 @@ const Header = () => {
     </header>
   );
 };
-=======
-  
-    return (
-        <header>
-            <h1><a href="#0"></a></h1>
-        </header>
-    );
-}
->>>>>>> homepage
 
 export default Header;