diff --git a/Jenkinsfile b/Jenkinsfile
index 08b04d5..f29fa5f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,20 +5,6 @@ pipeline {
         stage('Build') {
             steps {
                 sh '/opt/squish/bin/squish --no-minify'
-<<<<<<< HEAD
-                sh 'ldoc {env.WORKSPACE}'
-            }
-        }
-       /* stage('Deploy') {
-            when {
-                branch 'production'
-            }
-
-            steps {
-
-            }
-        }*/
-=======
                 sh "ldoc ${env.WORKSPACE}"
             }
         }
@@ -31,6 +17,5 @@ pipeline {
                 sh "python3 /opt/hoggit_releaser/releaser.py ${env.WORKSPACE} ${env.TAG_NAME}"
             }
         }
->>>>>>> feature/Jenkinsfile
     }
 }
\ No newline at end of file