From bbbf73dfa7f8b33065ac7aab7cfbf8f7d5915739 Mon Sep 17 00:00:00 2001
From: willmill1 <rmillner1125@gmail.com>
Date: Thu, 1 Oct 2026 10:48:05 -0400
Subject: [PATCH] testing merge conflicts

---
 slide_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slide_template.md b/slide_template.md
index 303f8d7f8..781d456e2 100644
--- a/slide_template.md
+++ b/slide_template.md
@@ -3,7 +3,7 @@ layout: slide
 title: "Welcome to our slide deck!"
 ---
 
-Caption here
+testing merge conflicts
 
 IMAGE
 {: .center}