fixed bug funnel
fixed merge
update package