diff --git a/client/src/reducers/index.js b/client/src/reducers/index.js
index 1b20294..e1dfdd5 100644
--- a/client/src/reducers/index.js
+++ b/client/src/reducers/index.js
@@ -9,8 +9,5 @@ export default combineReducers({
   auth,
   profile,
   post
-<<<<<<< HEAD
+
 });
-=======
-});
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb