fixed bug in check_conflict, used old? dependencie structure