From d88c1e0aea24942745d1d4e8041301e3de6737aa Mon Sep 17 00:00:00 2001
From: Hailey <Newburyh@coventry.ac.uk>
Date: Mon, 1 Jun 2026 17:31:48 +0100
Subject: [PATCH] changed to hieee

---
 Conflict.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Conflict.txt b/Conflict.txt
index 58ed9aa..f6b781a 100644
--- a/Conflict.txt
+++ b/Conflict.txt
@@ -1,2 +1,2 @@
-hie
+hieee
 Im a conflict
\ No newline at end of file