diff --git a/.github/workflows/github-pr.yaml b/.github/workflows/github-pr.yaml
index 9ab12fa86..dcc0c9853 100644
--- a/.github/workflows/github-pr.yaml
+++ b/.github/workflows/github-pr.yaml
@@ -45,6 +45,9 @@ jobs:
       - name: "Setup Gradle"
         uses: gradle/gradle-build-action@v2.9.0
 
+      - name: "Merge with Upstream"
+        run: git merge upstream/main
+
       - name: "Build & Test"
         run: ./gradlew build buildDocker