Adding support for delegate dependency lookup in containers
Fixing conflict