current husky file
merged conflicts