diff --git a/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt
index 4b116ed3287..58f1e3be4c8 100644
--- a/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt
+++ b/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt
@@ -274,12 +274,8 @@ class ConnectionActionButtonViewModelTest {
                 arrangement.getOrCreateOneToOneConversation(TestUser.USER_ID)
             }
             verify { arrangement.onOpenConversation(any()) }
-<<<<<<< HEAD
             verify { arrangement.onMissingKeyPackages wasNot Called }
-=======
-            verify { arrangement.onStartConversationError wasNot Called }
             assertEquals(false, viewModel.actionableState().isPerformingAction)
->>>>>>> 232e7359b (fix: button keeps spinning when user starts a conversation and back (WPB-5862) (#3372))
         }
 
     @Test
@@ -298,12 +294,8 @@ class ConnectionActionButtonViewModelTest {
                 arrangement.getOrCreateOneToOneConversation(TestUser.USER_ID)
             }
             verify { arrangement.onOpenConversation wasNot Called }
-<<<<<<< HEAD
             verify { arrangement.onMissingKeyPackages wasNot Called }
-=======
-            verify { arrangement.onStartConversationError(eq(failure)) }
             assertEquals(false, viewModel.actionableState().isPerformingAction)
->>>>>>> 232e7359b (fix: button keeps spinning when user starts a conversation and back (WPB-5862) (#3372))
         }
 
     @Test
@@ -322,12 +314,8 @@ class ConnectionActionButtonViewModelTest {
                 arrangement.getOrCreateOneToOneConversation(TestUser.USER_ID)
             }
             verify { arrangement.onOpenConversation wasNot Called }
-<<<<<<< HEAD
             verify { arrangement.onMissingKeyPackages() }
-=======
-            verify { arrangement.onStartConversationError(eq(errorResult)) }
             assertEquals(false, viewModel.actionableState().isPerformingAction)
->>>>>>> 232e7359b (fix: button keeps spinning when user starts a conversation and back (WPB-5862) (#3372))
         }
 
     companion object {