diff --git a/Jenkinsfile b/Jenkinsfile
index 434efdf..c845911 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,6 +35,7 @@ pipeline {
                 branch '**/sync-modpack'
             }
             steps {
+                sh "git merge -X theirs sync-modpack"
                 sh "git add mods/**"
                 sh "git add config/**"
                 sh "git clean -dfX"