some changes

frontend/package.json

@@ -17,12 +17,7 @@
     "native-base": "^3.2.2",
     "react": "17.0.2",
     "react-native": "0.66.2",
-<<<<<<< HEAD
-    "react-native-audio-recorder-player": "^3.3.4",
-    "react-native-chartjs": "^1.0.3",
-=======
     "react-native-audio-record": "^0.2.2",
->>>>>>> ef01cf5d3888e989084c7d61dff42b160793ac0a
     "react-native-elements": "^3.4.2",
     "react-native-fontawesome": "^7.0.0",
     "react-native-gesture-handler": "^1.10.3",

frontend/src/router/router.js

@@ -16,7 +16,7 @@ const Stack = createNativeStackNavigator();
 const AppRouter = () => {
   return (
     <NavigationContainer>
-      <Stack.Navigator initialRouteName="Color">
+      <Stack.Navigator initialRouteName="Login">
         <Stack.Screen
           options={{headerShown: false}}
           name="Home"
@@ -62,7 +62,6 @@ const AppRouter = () => {
           name="ReadActivity"
           component={ReadActivity}
         />
-        
       </Stack.Navigator>
     </NavigationContainer>
   );