diff --git a/コンフリクト.txt b/コンフリクト.txt
new file mode 100644
index 0000000..60857a2
--- /dev/null
+++ b/コンフリクト.txt
@@ -0,0 +1 @@
+コンフリクト
\ No newline at end of file