Update models.py

fix merge bug