fixing rebase artifacts, improving form_answers table