fixed bug in check_conflict, used old? dependencie structure
Merge pull request #231 from Duncaen/bug-230

fixed bug in check_conflict, used old? dependencie structure