(fix) module conflict resolved
Merge pull request #40 from renderf0x/dynamic_menus

(fix) module conflict resolved