resolved dbmodels conflict
err, resolve again?