edited menu
merging