fixed problem with merging forms.py