diff --git a/doc/冲突.docx b/doc/冲突.docx
new file mode 100644
index 0000000..e137087
Binary files /dev/null and b/doc/冲突.docx differ