diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationGroupRepository.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationGroupRepository.kt
index 10f21658a5d..7c7129f32da 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationGroupRepository.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationGroupRepository.kt
@@ -131,8 +131,7 @@ internal class ConversationGroupRepositoryImpl(
             }
 
             when (apiResult) {
-<<<<<<< HEAD
-                is Either.Left -> handleCreateConverstionFailure(
+                is Either.Left -> handleCreateConversationFailure(
                     apiResult = apiResult,
                     usersList = usersList,
                     name = name,
@@ -141,11 +140,6 @@ internal class ConversationGroupRepositoryImpl(
                 )
 
                 is Either.Right -> handleGroupConversationCreated(apiResult.value, selfTeamId, usersList, lastUsersAttempt)
-=======
-                is Either.Left -> handleCreateConversationFailure(apiResult, usersList, failedUsersList, name, options)
-
-                is Either.Right -> handleCreateConversationSuccess(apiResult, usersList, failedUsersList, selfTeamId)
->>>>>>> 478ed1e7d8 (fix: Allow creating empty MLS GroupConversation (#2869))
             }
         }