Fixed wrong merge of models.py