Fixed a merge conflict problem in models.py