added menu entry
fixed merge