diff --git a/src/boxes/Boxes.js b/src/boxes/Boxes.js
index a5c00c3..ebcff63 100644
--- a/src/boxes/Boxes.js
+++ b/src/boxes/Boxes.js
@@ -1,23 +1,13 @@
 import React from 'react';
 import styles from './Boxes.module.css'
-<<<<<<< HEAD
 import Cards from '../cards/Cards.js'
-=======
->>>>>>> card-setup
 
 export default function Boxes({ sectionName }) {
   return (
     <div>
       <h3>{sectionName}</h3>
       <div className={styles.box}>
-<<<<<<< HEAD
         <Cards />
-=======
-        <ul>
-          <li>
-          </li>
-        </ul>
->>>>>>> card-setup
       </div>
     </div>
   )
diff --git a/src/boxes/Boxes.module.css b/src/boxes/Boxes.module.css
index 672be54..369b994 100644
--- a/src/boxes/Boxes.module.css
+++ b/src/boxes/Boxes.module.css
@@ -1,8 +1,3 @@
 .box{
-<<<<<<< HEAD
-=======
-  display: grid;
-  grid-template: auto;
->>>>>>> card-setup
   border: .15rem solid black;
 }