diff --git a/mobile-app/app/_layout.tsx b/mobile-app/app/_layout.tsx
index 0d568307..8ad0bc0d 100644
--- a/mobile-app/app/_layout.tsx
+++ b/mobile-app/app/_layout.tsx
@@ -29,13 +29,8 @@ export default function RootLayout() {
 
   return (
     <ThemeProvider value={colorScheme === 'dark' ? DarkTheme : DefaultTheme}>
-<<<<<<< HEAD
       <Stack screenOptions={{headerShown: false}}>
         <Stack.Screen name='index' options={{headerShown: false}} />
-=======
-      <Stack screenOptions={{ headerShown: false }}>
-        <Stack.Screen name="index" />
->>>>>>> 4b52bc85332eecc28d69d39ab2f4c88bc262745a
       </Stack>
       <StatusBar style="auto" />
     </ThemeProvider>
diff --git a/mobile-app/app/index.tsx b/mobile-app/app/index.tsx
index ecbf53b9..137e18c8 100644
--- a/mobile-app/app/index.tsx
+++ b/mobile-app/app/index.tsx
@@ -1,7 +1,6 @@
-import { StyleSheet, Text, View } from 'react-native'
+import { StyleSheet } from 'react-native'
 import React from 'react'
-<<<<<<< HEAD
-import { Redirect, router } from 'expo-router'
+import { Redirect} from 'expo-router'
 
 export default function () {
   return (
@@ -10,15 +9,6 @@ export default function () {
     // </View>
 
     <Redirect href='/(drawer)/(tabs)' />
-=======
-import OnboardingScreen from "./screens/onboarding/onboarding.screen";
-
-export default function index() {
-  return (
-    <View>
- <OnboardingScreen />
-    </View>
->>>>>>> 4b52bc85332eecc28d69d39ab2f4c88bc262745a
   )
 }