Manually merging #1010 into humbucker