Manually merging humbucker into develop