added menu
fixed merge conflict