diff --git a/.github/workflows/test-analysis.yml b/.github/workflows/test-analysis.yml
index 4c477cbd6..e13ddbe76 100644
--- a/.github/workflows/test-analysis.yml
+++ b/.github/workflows/test-analysis.yml
@@ -1,30 +1,11 @@
 name: Build and test the project
+
 on:
   workflow_call:
     secrets:
       SONAR_TOKEN:
         required: true
-<<<<<<< HEAD
-      SSH_TESTING_SERVER_HOST:
-        required: true
-      SSH_TESTING_SERVER_PORT:
-        required: true
-      SSH_TESTING_SERVER_USER:
-        required: true
-      SSH_TESTING_SERVER_PASSWORD:
-        required: true
-    inputs:
-      report_dir:
-        type: string
-        required: true
-      report_context:
-        type: string
-        required: true
-env:
-  xb_version: "1.6.0"
-=======
 
->>>>>>> release-5.6.x
 jobs:
   test:
     name: Test and push Sonar analysis