minor fix when checking conflicts