hacky following
merge conflicts
main menu key exists now
merge conflict fixed