fixed popover positioning following merge