diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 46e28222b..dcb0ced04 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -6,7 +6,7 @@ cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
   repo: 'git://github.com/diaspora/diaspora.git'
-  branch: 'em-webfinger'
+  branch: 'emw-merge'
   default_env: 'development'
 servers:
   tom: