Fixed the errors in models.py introduced during merge