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