fix merge err
Merge pull request #6 from atsapenko/forms

fix merge err