fix build

Signed-off-by: wind57 <[email protected]>

Author: wind57

.github/workflows/composites/pre-test-actions/action.yaml

@@ -24,11 +24,7 @@ runs:
     - name: build project
       shell: bash
       run: |
-<<<<<<< HEAD
-        ./mvnw clean install -P 'run-on-github-actions' -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q  
-=======
-        ./mvnw clean install -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
->>>>>>> main
+        ./mvnw clean install -P 'run-on-github-actions' -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
 
     - name: build controllers project
       uses: ./.github/workflows/composites/build-controllers-project