Fix an off-by-one error. Make the popover work correctly when conflicts occur.