modify by yuri f0821
fix conflict