diff --git a/contacts/build.properties b/contacts/build.properties
index 3dc9908..9ea0cf4 100644
--- a/contacts/build.properties
+++ b/contacts/build.properties
@@ -1,4 +1,5 @@
 #Created by .winboll/winboll_app_build.gradle
+<<<<<<< HEAD
 #Tue Jul 21 11:13:12 CST 2026
 stageCount=12
 libraryProject=
@@ -6,3 +7,12 @@ baseVersion=15.21
 publishVersion=15.20.11
 buildCount=22
 baseBetaVersion=15.20.12
+=======
+#Tue Jul 21 02:54:31 GMT 2026
+stageCount=0
+libraryProject=
+baseVersion=15.21
+publishVersion=15.21.0
+buildCount=1
+baseBetaVersion=15.21.1
+>>>>>>> origin/contacts