finished merge

App.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { DefaultTheme, NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
-// import QRCodeScanner from '@/components/QRCodeScanner/QRCodeScanner';
-// import HomeScreen from '@/screens/Home/Home';
-// import TreeInfoPage from '@/screens/TreeInfo/TreeInfo';
+import QRCodeScanner from '@/components/QRCodeScanner/QRCodeScanner';
+import HomeScreen from '@/screens/Home/Home';
+import TreeInfoPage from '@/screens/TreeInfo/TreeInfo';
 import AllTreesScreen from '@/screens/all_trees/AllTreesScreen';
 import AvailableTreesScreen from '@/screens/available_trees/AvailableTreesScreen';
 import LoginScreen from '@/screens/login/LoginScreen';
-import { LoginStackParamList } from '@/types/navigation';
+import { LoginStackParamList, RootStackParamList } from '@/types/navigation';
 
 const RootStack = createNativeStackNavigator<RootStackParamList>();
 const LoginStack = createNativeStackNavigator<LoginStackParamList>();