added merge conflict to menu.txt