From ba263a96dd5e91e219eb414322a665a885ba225d Mon Sep 17 00:00:00 2001
From: eyramana <eyramana.pro@gmail.com>
Date: Mon, 10 Aug 2026 11:02:29 +0530
Subject: [PATCH] Add conflict demonstration 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..62694b6
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1,2 @@
+hello world 
+change made in main branch