correct conflict check bug