added models to database
merge conflicts