fix menu
merge