fix conflict test