update mainmenu
merge