updated database
merge models.py conflict fix