diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c9455d6bf183f6bb9fd266e87edf968b81c0208..b84d22038b3159fd5aedb951fb48c35b99babe94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -445,11 +445,7 @@ sonar-scanner:
 
   script:
     - cd $CI_PROJECT_DIR
-<<<<<<< HEAD
-    - sonar-scanner -X -Dsonar.verbose=true -Dsonar.login=$SONAR_SECURITY_TOKEN
-=======
     - sonar-scanner -Dsonar.login=$SONAR_SECURITY_TOKEN
->>>>>>> open_source
 
 ###############################################################################
 ##                              Release                                      ##