diff --git a/Jenkinsfile b/Jenkinsfile
index 3766bfa1bc04a46950b544c5913ac1828d2e3cfd..976a891ab49860e5d1d25b3e679d73340ae88e6c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -139,7 +139,8 @@ 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
-                      git merge -X theirs --no-commit FETCH_HEAD
+                      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}'`
                    """
             }
         }
diff --git a/client-qt b/client-qt
index 1a14fd27fe6d99ae130604daaf1cc0d99aec1040..300ac17db3372cd7e9c52cc77eafca0c63bcbbe2 160000
--- a/client-qt
+++ b/client-qt
@@ -1 +1 @@
-Subproject commit 1a14fd27fe6d99ae130604daaf1cc0d99aec1040
+Subproject commit 300ac17db3372cd7e9c52cc77eafca0c63bcbbe2
diff --git a/daemon b/daemon
index 72a7d2339a1ba9bb1cf356f19c28deeb2f9be76e..3e83204248340d2548051bdbf087b451b9dad9dd 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 72a7d2339a1ba9bb1cf356f19c28deeb2f9be76e
+Subproject commit 3e83204248340d2548051bdbf087b451b9dad9dd