diff --git a/core/analytics-enabled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt b/core/analytics-enabled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt
index 1a3f77a2ae..6baadc5b29 100644
--- a/core/analytics-enabled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt
+++ b/core/analytics-enabled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt
@@ -86,11 +86,7 @@ class AnonymousAnalyticsRecorderImpl : AnonymousAnalyticsRecorder {
 
     override fun halt() = wrapCountlyRequest {
         isConfigured = false
-<<<<<<< HEAD
-        Countly.sharedInstance().consent().removeConsentAll()
-=======
         Countly.sharedInstance()?.consent()?.removeConsentAll()
->>>>>>> 5e643acf0 (fix: countly sdk integration replace halt and bump to latest (WPB-15007) (#3748))
     }
 
     override suspend fun setTrackingIdentifierWithMerge(