Problem solved

Jenkinsfile

@@ -16,8 +16,6 @@ pipeline {
                     sh 'mvn test'
             }
         }
-<<<<<<< HEAD
-=======
 
         stage ('Installing Stage') {
             steps {
@@ -25,6 +23,5 @@ pipeline {
             }
         }
         
->>>>>>> feature-1
     }
 }