added new husky version
fixed merge conflicts