From 57d1fcd1b92577fd4e836c6a44328b464f5fae89 Mon Sep 17 00:00:00 2001
From: sara-couch <84733020+sara-couch@users.noreply.github.com>
Date: Mon, 28 Sep 2026 10:28:30 -0500
Subject: [PATCH 1/4] test commit

---
 my-file.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 my-file.md

diff --git a/my-file.md b/my-file.md
new file mode 100644
index 00000000..8318c86b
--- /dev/null
+++ b/my-file.md
@@ -0,0 +1 @@
+Test
\ No newline at end of file

From c789c68fe0194a6ef47996dfabcf7cd9d4cc82df Mon Sep 17 00:00:00 2001
From: sara-couch <84733020+sara-couch@users.noreply.github.com>
Date: Mon, 28 Sep 2026 10:38:14 -0500
Subject: [PATCH 2/4] Update my-file.md

---
 my-file.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/my-file.md b/my-file.md
index 8318c86b..4feabc57 100644
--- a/my-file.md
+++ b/my-file.md
@@ -1 +1,3 @@
-Test
\ No newline at end of file
+Test
+
+These are more changes

From 6f5d745804a9f40cfacc184aebcb7da539089def Mon Sep 17 00:00:00 2001
From: sara-couch <84733020+sara-couch@users.noreply.github.com>
Date: Mon, 28 Sep 2026 13:47:09 -0500
Subject: [PATCH 3/4] sara-first commit

---
 my-file.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/my-file.md b/my-file.md
index 4feabc57..8fa28395 100644
--- a/my-file.md
+++ b/my-file.md
@@ -1,3 +1,5 @@
 Test
 
 These are more changes
+
+Sara-first change

From df056a317703d72118ecfe5793affc5b3e8610c7 Mon Sep 17 00:00:00 2001
From: sara-couch <84733020+sara-couch@users.noreply.github.com>
Date: Mon, 28 Sep 2026 13:49:50 -0500
Subject: [PATCH 4/4] conflict commit

---
 my-file.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/my-file.md b/my-file.md
index 4feabc57..f5c2d702 100644
--- a/my-file.md
+++ b/my-file.md
@@ -1,3 +1,5 @@
 Test
 
 These are more changes
+
+These are conflict changes
\ No newline at end of file