diff --git a/コンフリクト.txt b/コンフリクト.txt
index 60857a2..a2f305e 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1 @@
-コンフリクト
\ No newline at end of file
+コンフリクトテスト池田
\ No newline at end of file