Revert "我想把错误的融合删掉"

This reverts commit 6b2d4e2755c9a5ef9bbcf7d4593314590d8a57d8.