From 937f772993153f3e15f72db1c5fd46e33d823f1e Mon Sep 17 00:00:00 2001
From: v1mbi <saurombeian@gmail.com>
Date: Mon, 1 Jun 2026 17:24:13 +0100
Subject: [PATCH] made conflict file

---
 Conflict.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Conflict.txt

diff --git a/Conflict.txt b/Conflict.txt
new file mode 100644
index 0000000..e11f06c
--- /dev/null
+++ b/Conflict.txt
@@ -0,0 +1,2 @@
+hello!
+Im a conflict
\ No newline at end of file