Revert "测试是否产生冲突"

This reverts commit 2ea5b5aec5aec32ffb54ccc995ca56522b5c5ec6.