changed models file
fixed conflictt in models.py