diff --git a/merge_helpers.sh b/merge_helpers.sh
index 503de8ea61..1105648c86 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -73,7 +73,8 @@ upstream_common_base() {
         #    commit="$merged_main"
         #else
             >&2 echo "ERROR: don't know how to compare main and develop upstream branches"
-            exit 1
+            commit="$merged_develop"
+            #exit 1
         #fi
     fi
     echo "$commit"