cleanup
merge
menu null exception