merge butterfly_types_REV_O.sql into butterfly_types.sql