tweak conflict check