diff --git a/doc/冲突.docx b/doc/冲突.docx
index 65a4bb3..380d2fc 100644
Binary files a/doc/冲突.docx and b/doc/冲突.docx differ