menu options appear
merge conflict resolved