diff --git a/gradle.properties b/gradle.properties
index b151752a8..e65d00cfd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,10 +26,6 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
 
-<<<<<<< HEAD
-versionCode=57
-versionName=4.11.11
-=======
 versionCode=101
 versionName=4.12.01
->>>>>>> release-20250211
+