added merge controls to edit view