added dependency management
resolved merge conflict