fix conflict check