moved merge to _edit.html
moved merge to _edit.html