Add a paragraph tag around the form elements.
Resolve the merge conflict for _formhtmlers.html.