added new husky
fixed event error in button
merged conflicts