From 87831071e96a3572df90b0825dfff571377435af Mon Sep 17 00:00:00 2001
From: Zackary Santana <64446617+ZackarySantana@users.noreply.github.com>
Date: Fri, 6 Feb 2026 10:32:31 -0500
Subject: [PATCH] some merge conflict

---
 evergreen.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/evergreen.yml b/evergreen.yml
index 70e7a891..ac4f66d5 100644
--- a/evergreen.yml
+++ b/evergreen.yml
@@ -1,7 +1,3 @@
-include:
-  - filename: evergreen.yml
-    module: test-trigger-sandbox
-
 patch_aliases:
   - alias: "chaya-tag-from-yaml"
     variant_tags: ["commit-queue-variant"]
@@ -16,7 +12,6 @@ buildvariants:
       - name: checkrun_test
 
 tasks:
-
   - name: checkrun_test
     commands:
       - command: shell.exec