resolve conflict of forms.py
resolve conflict of forms.py

Team-Ace/fs_site,YixuanAshleyGuo/fs_site,Team-Ace/fs_site,YixuanAshleyGuo/fs_site,Team-Ace/fs_site,YixuanAshleyGuo/fs_site,CraigRhodes/fs_site,CraigRhodes/fs_site,CraigRhodes/fs_site,YixuanAshleyGuo/fs_site,Team-Ace/fs_site,CraigRhodes/fs_site