diff --git a/teamwork.txt b/teamwork.txt
index 94c6d7c..a362d76 100644
--- a/teamwork.txt
+++ b/teamwork.txt
@@ -1 +1 @@
-协作冲突内容：B 同学独立修改
+协作冲突已解决：保留 A 和 B 的共同修改