diff --git a/client/src/reducers/auth.js b/client/src/reducers/auth.js
index 02537f6..d9ab5c0 100644
--- a/client/src/reducers/auth.js
+++ b/client/src/reducers/auth.js
@@ -50,8 +50,6 @@ function authReducer(state = initialState, action) {
   }
 }
 
-<<<<<<< HEAD
+
 export default authReducer;
-=======
-export default authReducer;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+