diff --git a/src/test.txt b/src/test.txt
index be084df1..a00af07a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-画像开发
+merge