updated dependencies
resolved merge conflict