From 5c202b967047bbcf0a06da50148efd76b34861e9 Mon Sep 17 00:00:00 2001
From: Atif <39148554+atif09@users.noreply.github.com>
Date: Tue, 17 Feb 2026 02:27:45 +0530
Subject: [PATCH] test: conflict backport

[backport 1.1]

(cherry picked from commit 075547365279e85dad457748e3a452a218a25aaf)
---
 conflict_test.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflict_test.txt

diff --git a/conflict_test.txt b/conflict_test.txt
new file mode 100644
index 0000000..b5803c9
--- /dev/null
+++ b/conflict_test.txt
@@ -0,0 +1 @@
+different content on main