specify conflict case for forms

[ci skip]
Merge pull request #2159 from opf/fix/specify_form_conflict