From 302ebeeb83857d50aa5fe83eb88a1d3699481a8b Mon Sep 17 00:00:00 2001
From: Xiomaraze <148461503+Xiomaraze@users.noreply.github.com>
Date: Thu, 19 Oct 2023 10:04:11 -0400
Subject: [PATCH] conflict!

---
 testfile.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testfile.txt b/testfile.txt
index c57f645..35a86a2 100644
--- a/testfile.txt
+++ b/testfile.txt
@@ -4,3 +4,4 @@ This is a second line.
 The 4th line is way cooler than the rest :-)
 :-)
 On the second branch we can make even more edits.
+spicy