Commiting forms.py
Solving merge for forms.py