diff --git a/src/main/kotlin/main/Main.kt b/src/main/kotlin/main/Main.kt
index 59b7088..f7c2bf7 100644
--- a/src/main/kotlin/main/Main.kt
+++ b/src/main/kotlin/main/Main.kt
@@ -22,14 +22,10 @@ import java.awt.Frame
 import java.io.File
 import java.io.FileWriter
 import java.io.IOException
-<<<<<<< src/main/kotlin/main/Main.kt
-
-=======
 import org.apache.poi.ss.usermodel.CellType
 import org.apache.poi.ss.usermodel.Workbook
 import org.apache.poi.xssf.usermodel.XSSFWorkbook
 import java.io.FileInputStream
->>>>>>> src/main/kotlin/main/Main.kt
 
 val customRedColor = Color(0xFFB70D1B)
 
@@ -498,11 +494,8 @@ fun glossairePage(
 
 }
 
-<<<<<<< src/main/kotlin/main/Main.kt
 
 @OptIn(ExperimentalMaterialApi::class)
-=======
->>>>>>> src/main/kotlin/main/Main.kt
 @Composable
 fun formulairePage(onAnnulerClick: () -> Unit) {
     // State to track whether to show the snackbar