From 1204083ca5e241e894f9c0eb4fb34969a1e40b55 Mon Sep 17 00:00:00 2001
From: Mark Heydon <markheydon@users.noreply.github.com>
Date: Mon, 17 Feb 2025 17:41:24 +0000
Subject: [PATCH] Update pull.yml

---
 .github/pull.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull.yml b/.github/pull.yml
index f8e565fb8de4..93aa99b1cf1d 100644
--- a/.github/pull.yml
+++ b/.github/pull.yml
@@ -5,4 +5,4 @@ rules:
     mergeMethod: merge
   - base: dev
     upstream: KelvinTegelaar:dev
-    mergeMethod: none
+    mergeMethod: merge