diff --git a/conflict_test.txt b/conflict_test.txt
new file mode 100644
index 0000000000000..60f8fa8f4822d
--- /dev/null
+++ b/conflict_test.txt
@@ -0,0 +1 @@
+Branch 6 change