update menu
resolve merge conflict