changes to the popup
menu merge conflict