diff --git a/client/src/store.js b/client/src/store.js
index f6169e9..c453748 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -36,8 +36,5 @@ store.subscribe(() => {
   }
 });
 
-<<<<<<< HEAD
 export default store;
-=======
-export default store;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+