added popover
fixed conflicts