added dialog on item selection
fixed merge conflict