diff --git a/src/pages/Projects.tsx b/src/pages/Projects.tsx
index ce578b4..956524c 100644
--- a/src/pages/Projects.tsx
+++ b/src/pages/Projects.tsx
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
 import Footer from "../containers/Footer";
 
-=======
-import Card from "./../containers/Card";
-import Footer from "../containers/Footer";
-
-const projects = ["pokemon"];
->>>>>>> main
 
 const Projects = () => {
   return (