merge conflict again in models.py