fixed bug with is_conflict()