branch merge issues

updated issues with merging two menus.