diff --git a/client/src/components/layout/NotFound.js b/client/src/components/layout/NotFound.js
index df23b1d..7a243da 100644
--- a/client/src/components/layout/NotFound.js
+++ b/client/src/components/layout/NotFound.js
@@ -11,8 +11,4 @@ const NotFound = () => {
   );
 };
 
-<<<<<<< HEAD
 export default NotFound;
-=======
-export default NotFound;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb