merge
edit_object now returns the form instance