diff --git a/Jenkinsfile b/Jenkinsfile
index 976a891ab49860e5d1d25b3e679d73340ae88e6c..3766bfa1bc04a46950b544c5913ac1828d2e3cfd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -139,8 +139,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
                       git reset --hard origin/${params.CHANNEL}
                       # Submodules are generally not managed by merging
                       git status
-                      rm -rf client-gnome lrc-gnome
-                      git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
+                      git merge -X theirs --no-commit FETCH_HEAD
                    """
             }
         }
diff --git a/build.py b/build.py
index ff0ed626700d2694c399c64b37710c4f68998fa9..5dce0b014224439165977afb222631a53fd1723b 100755
--- a/build.py
+++ b/build.py
@@ -395,7 +395,7 @@ def run_init():
     for name in module_names:
         copy_file("./scripts/commit-msg", ".git/modules/"+name+"/hooks")
 
-    module_names_to_format = ['daemon', 'lrc', 'client-qt', 'plugins']
+    module_names_to_format = ['daemon', 'client-qt', 'plugins']
     for name in module_names_to_format:
         execute_script(
             ['./scripts/format.sh --install  %(path)s'],