updated menu
fixed merge