Attempted to fix merge error in forms.py file. Can not figure out where 2 lines go so they are commented out but still there.