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