diff --git a/src/test.txt b/src/test.txt
index 8c002603..5ac85558 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-solve conflict
+Merge branch 'V20221228' into fix-3262