updated husky
merged conflicts