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