merge conflict in models.py