Revert "去掉冲突"

This reverts commit 3873e04fd7e8be5ef262d313d2bfa27c5f8c0889.