Fix merge issue

Author: pacphi

build.gradle

@@ -1,10 +1,6 @@
 plugins {
 	id 'java'
-<<<<<<< Updated upstream
-	id 'org.cyclonedx.bom' version '2.1.0'
-=======
 	id 'org.cyclonedx.bom' version '2.2.0'
->>>>>>> Stashed changes
 	id 'com.gorylenko.gradle-git-properties' version '2.4.2'
 	id 'org.springframework.boot' version '3.4.3'
 	id 'io.spring.dependency-management' version '1.1.7'