diff --git a/gradle/version.properties b/gradle/version.properties
index 7cc669e01..2310dc846 100644
--- a/gradle/version.properties
+++ b/gradle/version.properties
@@ -1,5 +1 @@
-<<<<<<< HEAD
-projectVersion=4.0.0-SNAPSHOT
-=======
-projectVersion=3.1.0-SNAPSHOT
->>>>>>> 2a11b54c ([#2387] Upgrade Hibernate ORM to 7.1.0.CR1)
+projectVersion=4.1.0-SNAPSHOT