change edit dish
merge and change edit dish