diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 47f671e517ee9b250b8d6fd9af153ea2cdc81354..31b599fd30eabbaad74d6beaf22010d94895d251 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -1288,13 +1288,8 @@ ldap.learningResourceManagerRoleValue=
 # Build properties
 #####
 application.name=OpenOlat
-<<<<<<< HEAD
 build.version=15.1a
 build.identifier=openolat151a-dev
-=======
-build.version=15.0.1
-build.identifier=openolat1501-dev
->>>>>>> refs/heads/OpenOLAT_15.0
 build.repo.revision=local-devel
 
 #####