diff --git a/client/src/actions/auth.js b/client/src/actions/auth.js
index 5341e64..74a933a 100644
--- a/client/src/actions/auth.js
+++ b/client/src/actions/auth.js
@@ -63,10 +63,6 @@ export const login = (email, password) => async (dispatch) => {
   try {
     const res = await api.post("/auth", body);
 
-<<<<<<< HEAD
-    console.log(res)
-=======
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
     dispatch({
       type: LOGIN_SUCCESS,
       payload: res.data,