diff --git a/package-lock.json b/package-lock.json
index 1b1f200..8679dc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6584,8 +6584,6 @@
       "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-2.3.3.tgz",
       "integrity": "sha512-d/rA8Slqv7HoMfONKVDBQUrRF7YQH796Gzal/KOhaY4VOwUUqIwfxMRJ3WrsdL2OkDPixtkXJE2Fz6KAj658uA=="
     },
-<<<<<<< HEAD
-=======
     "react-navigation-header-buttons": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-navigation-header-buttons/-/react-navigation-header-buttons-3.0.4.tgz",
@@ -6594,7 +6592,6 @@
         "react-native-platform-touchable": "^1.1.1"
       }
     },
->>>>>>> origin/displayWorkspace
     "react-navigation-stack": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/react-navigation-stack/-/react-navigation-stack-1.10.2.tgz",
diff --git a/src/authentication/store/Action/auth.js b/src/authentication/store/Action/auth.js
index 04390c1..3374ada 100644
--- a/src/authentication/store/Action/auth.js
+++ b/src/authentication/store/Action/auth.js
@@ -68,11 +68,7 @@ export const login = (email, password) => {
 
       const accountData = await response.json()
       dispatch({ type: LOGIN, token: accountData.idToken, userId: accountData.localId });
-<<<<<<< HEAD
       firebase.auth().signInWithEmailAndPassword(email,password)
-=======
-      // console.log(firebase.auth().signInWithEmailAndPassword(email,password))
->>>>>>> origin/displayWorkspace
   }
 }