fix forms.py
Merged non conflicts lol