Fixed merge bug in models.py