diff --git a/jarvistest/conflict.txt b/jarvistest/conflict.txt
new file mode 100644
index 0000000000..663d028b20
--- /dev/null
+++ b/jarvistest/conflict.txt
@@ -0,0 +1 @@
+CONFLICT change