butt details
merge fix