conflicts
re positioned error form
form error message style fix
fixes