From dfa140727b0b58d2d29e70cc52ac1502457e1c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=84=9D=EC=98=81=EB=AF=BC?= <ttow778@gmail.com>
Date: Thu, 7 Aug 2025 17:53:37 +0900
Subject: [PATCH] test

---
 conflict-demo | 1 +
 pr.txt        | 1 +
 2 files changed, 2 insertions(+)
 create mode 160000 conflict-demo
 create mode 100644 pr.txt

diff --git a/conflict-demo b/conflict-demo
new file mode 160000
index 0000000..267adc1
--- /dev/null
+++ b/conflict-demo
@@ -0,0 +1 @@
+Subproject commit 267adc1c40d45e87b2a6d4373dfd7582e913990e
diff --git a/pr.txt b/pr.txt
new file mode 100644
index 0000000..9d2dd51
--- /dev/null
+++ b/pr.txt
@@ -0,0 +1 @@
+Hello PR