diff --git a/src/main/kotlin/main/Main.kt b/src/main/kotlin/main/Main.kt
index 2f8e33c..8268642 100644
--- a/src/main/kotlin/main/Main.kt
+++ b/src/main/kotlin/main/Main.kt
@@ -163,11 +163,7 @@ fun app() {
 fun selectFile(extensions: Set<String>, onFileSelected: (String) -> Unit) {
     val fileDialog = FileDialog(Frame(), "Select a file", FileDialog.LOAD)
     fileDialog.isMultipleMode = false // To enable selecting only one file
-<<<<<<< HEAD
     fileDialog.file = "*." + extensions.joinToString(";*.")
-=======
-    fileDialog.file = "." + extensions.joinToString(";.")
->>>>>>> e781783c7b2bf2f23f4b744a28d7d380abad4702
     fileDialog.isVisible = true