Repaired a merge error in data/forms.py