merge hover branch