diff --git a/src/Redux/Service/authSlice.tsx b/src/Redux/Service/authSlice.tsx
index a5f1888..56f5903 100644
--- a/src/Redux/Service/authSlice.tsx
+++ b/src/Redux/Service/authSlice.tsx
@@ -5,13 +5,8 @@ type AuthState = {
 };
 
 const initialState: AuthState = {
-<<<<<<< HEAD
   token: localStorage.getItem("token"), // Load token from localStorage
 }; 
-=======
-  token: localStorage.getItem("token") || null, // ✅ Ensures token is either a string or null
-};
->>>>>>> 7a7aeab5b877a665b488245d14c520a0dc3df1c9
 
 const authSlice = createSlice({
   name: "auth",