add menu and uncomplete
merge