Revert "分支合并测试"

This reverts commit ceb8fcfbbfb465c75a27a3983706a7d58788c6bd.