merge show & edit