diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38f9d3e..75032c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,11 +113,7 @@ create-build-image:
 
 # Run OWASP checks - expensive so only on main branch
 owasp-check:
-<<<<<<< Upstream, based on origin/main
-  extends: .java
-=======
   stage: test
->>>>>>> bad4cab Fix/owasp oom
   image: maven:3-eclipse-temurin-21-alpine
   needs: [ ]
   # set job timeout to 1 hour - it's required when new rules are downloaded