Fixed merge problems in models.py