add popover view
fix conflict