modify by gaozhenyu
fix conflict