menu is now correct again after merge