diff --git a/bin/pull-from-upstream b/bin/pull-from-upstream
index 5d58744..33b67a1 100755
--- a/bin/pull-from-upstream
+++ b/bin/pull-from-upstream
@@ -1,20 +1,20 @@
 #!/bin/bash
 
 set -e
 
 if [ -d .git/refs/remotes/upstream ]; then
     git fetch upstream --tags
 
     oldbranch=$(git rev-parse --abbrev-ref HEAD)
 
     if [ "$oldbranch" != "master" ]; then
         git checkout master
     fi
 
-    git merge upstream/master
+    git merge upstream/main || git merge upstream/master
     git push origin master:master --tags
 
     if [ "$oldbranch" != "master" ]; then
         git checkout $oldbranch
     fi
 fi