fix conflict bug