re-add models.js after rebase error