fixed bug in edit form
fixed merge conflict