merge
merge
show and edit functionality