diff --git a/Jenkinsfile b/Jenkinsfile
index 73a4b07e8..4449364cf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,8 +24,13 @@ pipeline {
         }
         stage('build') {
             steps {
+<<<<<<< HEAD
                 archiveArtifacts artifacts: '**/target/surefire-reports/TEST-*.xml'
                 junit testResults : '**/target/surefire-reports/TEST-*.jar'
+=======
+                archiveArtifacts artifacts: '**/target/surefire-reports/TEST-*.xml',
+                junit testResults: '**/target/surefire-reports/TEST-*.xml'
+>>>>>>> f531905a03ca63a789b989629593531fb3c7ab7c
             }
         }
     }
@@ -41,4 +46,4 @@ pipeline {
                  to: 'vinod@gmail.com'
         }
     }
-}
\ No newline at end of file
+}