merged folder
added menu item param settings
fixing branch bug issues