diff --git a/client/src/components/layout/Spinner.js b/client/src/components/layout/Spinner.js
index bc61086..d4255c3 100644
--- a/client/src/components/layout/Spinner.js
+++ b/client/src/components/layout/Spinner.js
@@ -11,8 +11,4 @@ const Spinner = () => (
   </Fragment>
 );
 
-<<<<<<< HEAD
 export default Spinner;
-=======
-export default Spinner;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb