updated model, only Quota model, seed data added (run rake db:seed)
resolve conflict