Merge version of HuBo