added choice menu
merge conflict