moved merge to _edit.html
changed merge to form
added merge_with function
syntax changes