merge fixed popover for knockour 3.x