Edited out conflict code

models.js