modified _form.html.haml
fixed merge conflict