diff --git a/Routinely/app/navigation.js b/Routinely/app/navigation.js
index b586511..efb1b8a 100644
--- a/Routinely/app/navigation.js
+++ b/Routinely/app/navigation.js
@@ -31,28 +31,13 @@ const AppStack = createStackNavigator(
 );
 
 export default createAppContainer(
-<<<<<<< HEAD
-    createSwitchNavigator(
-      {
-        App: AppStack,
-        Auth: AuthStack,
-        //Calendar: CalendarScreen,
-      },
-      {
-        initialRouteName: "Auth"
-      }
-    )
-  );
-=======
   createSwitchNavigator(
     {
       App: AppStack,
       Auth: AuthStack,
-      //Calendar: CalendarScreen,
     },
     {
-      initialRouteName: 'App',
+      initialRouteName: 'Auth',
     },
   ),
 );
->>>>>>> c3eb9904c6552e68d1228b82b9cc3102a266db37