diff --git a/README.md b/README.md
index 9a21964..6345caa 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@ cd schildichat-desktop
 
 ## Build
 
-`make`
+`make [{web|debian|pacman|windows}-release]`
 
 ## Install
 
-Installable packages should appear in element-desktop/dist/.
+Installable packages should appear in release/.
diff --git a/merge_helpers.sh b/merge_helpers.sh
index ca2bfa1..a4c002e 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -37,3 +37,18 @@ forall_repos() {
     "$@"
     popd
 }
+
+ensure_yes() {
+    read -e -p "$1 [y/N] " choice
+    
+    if [[ "$choice" != [Yy]* ]]; then
+        exit 1
+    fi
+}
+
+check_branch() {
+    if [[ $(git branch --show-current) != "$1" ]]; then
+        repo_name=$(basename `git rev-parse --show-toplevel`)
+        ensure_yes "$repo_name not in branch $1. Continue?"
+    fi
+}
diff --git a/merge_upstream.sh b/merge_upstream.sh
index 754b50c..2d21c08 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -3,13 +3,18 @@
 set -e
 
 mydir="$(dirname "$(realpath "$0")")"
+branch=${BRANCH:-"sc"}
 
 pushd "$mydir" > /dev/null
 
 source ./merge_helpers.sh
 
+check_branch $branch
+forall_repos check_branch $branch
 
 forall_repos git fetch upstream
 forall_repos git merge upstream/master
 
+./setup.sh
+
 popd > /dev/null