moved merge to _edit.html
moved merge to _edit.html
moved merge to _edit.html
changed merge to form
added merge_with function
syntax changes
moved merge_with above protected
updates of cucumber scenarios and steps