diff --git a/Jenkinsfile b/Jenkinsfile
index c268b8fb4..d37b5fe6f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,13 +24,8 @@ pipeline {
         }
         stage('build') {
             steps {
-<<<<<<< HEAD
                 archiveArtifacts artifacts: '**/target/spring-petclinic-*.jar'
                 junit testResults : '**/target/surefire-reports/TEST-*.xml'
-=======
-                archiveArtifacts artifacts: '**/target/spring-petclinic-*.jar'
-                junit testResults: '**/target/surefire-reports/TEST-*.xml'
->>>>>>> f531905a03ca63a789b989629593531fb3c7ab7c
             }
         }
     }