Fixed dependencies
Fix conflicts.