diff --git a/scripts/merge-forward.sh b/scripts/merge-forward.sh
index 3a7632e70d736..a70bf7e9f71c5 100755
--- a/scripts/merge-forward.sh
+++ b/scripts/merge-forward.sh
@@ -6,8 +6,11 @@ set -exo pipefail
 git fetch --all
 git checkout -B v2-main origin/v2-main
 
+git merge origin/master --no-edit
+
 # Some package rules differ between v1 and v2, most notably which packages can be public vs private.
 # These differences are fixable via 'pkglint', so we run that and commit the delta (if any).
-lerna run pkglint && { git diff --quiet || git commit -am 'automatic pkglint fixes'; }
-
-git merge origin/master --no-edit
+yarn install --frozen-lockfile
+yarn pkglint
+# Commit the difference, if there is one.
+git diff --quiet || git commit -am 'automatic pkglint fixes'