diff --git a/src/test.txt b/src/test.txt
index 2ed07005..9db222fb 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'feature_ide_20221214' into v20230215_ide_feature
+解决模型冲突问题