update details view
add edit
merge