Fix check conflict logical error