merge to haso