updated husky
resolved merge conflicts