diff --git a/build-logic/plugins/src/main/kotlin/AndroidCoordinates.kt b/build-logic/plugins/src/main/kotlin/AndroidCoordinates.kt
index 2dc20e7297d..349e53fcc6c 100644
--- a/build-logic/plugins/src/main/kotlin/AndroidCoordinates.kt
+++ b/build-logic/plugins/src/main/kotlin/AndroidCoordinates.kt
@@ -26,7 +26,11 @@ object AndroidSdk {
 
 object AndroidApp {
     const val id = "com.wire.android"
+<<<<<<< HEAD
     const val versionName = "4.10.0"
+=======
+    const val versionName = "4.9.2"
+>>>>>>> 9923285e7 (fix: disabling countly on prod (WPB-14829) (#3708))
     val versionCode by lazy {
         Versionizer(_rootDir).versionCode
     }
diff --git a/default.json b/default.json
index 2256ba670f6..abaaa20c9e8 100644
--- a/default.json
+++ b/default.json
@@ -6,7 +6,14 @@
             "logging_enabled": false,
             "application_is_private_build": false,
             "development_api_enabled": false,
+<<<<<<< HEAD
             "analytics_enabled": false,
+=======
+            "mls_support_enabled": false,
+            "analytics_enabled": false,
+            "paginated_conversation_list_enabled": true,
+            "encrypt_proteus_storage": true,
+>>>>>>> 9923285e7 (fix: disabling countly on prod (WPB-14829) (#3708))
             "analytics_app_key": "4483f7a58ae3e70b3780319c4ccb5c88a037be49",
             "analytics_server_url": "https://countly.wire.com/"
         },