Correct Merge issues

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/navigations/AppNavigator.kt

@@ -129,20 +129,20 @@ fun AppNavigator() {
         composable(Destination.SubmitQuote.route) { SubmitQuotePage() }
 
         composable(Destination.QuizMenu.route) {
-            val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
+            //val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
             QuizMenu(
-                index = userIndex,
+                //index = userIndex,
-                navAccueil = { userIndex ->
+//                navAccueil = { userIndex ->
-                    navController.navigate(Destination.Accueil.createRoute(userIndex))  // Passe l'index à Profil
+//                    navController.navigate(Destination.Accueil.createRoute(userIndex))  // Passe l'index à Profil
-                },
+//                },
-                navFavorite = { userIndex ->
+//                navFavorite = { userIndex ->
-                    navController.navigate(Destination.Favorite.createRoute(userIndex))  // Passe l'index à Profil
+//                    navController.navigate(Destination.Favorite.createRoute(userIndex))  // Passe l'index à Profil
-                },
+//                },
+//                navProfil = { userIndex ->
+//                    navController.navigate(Destination.Profil.createRoute(userIndex))  // Passe l'index à Profil
+//                },
                 navControllerQuiz = { id ->
                     navController.navigate(Destination.Quiz.createId(id))
-                },
-                navProfil = { userIndex ->
-                    navController.navigate(Destination.Profil.createRoute(userIndex))  // Passe l'index à Profil
                 }
             )
         }

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizEndPage.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.example.what_the_fantasy.R
 import com.example.what_the_fantasy.data.local.QuestionStub
+import com.example.what_the_fantasy.data.local.QuizStub
 
 val gradient = Brush.linearGradient(
     colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)),