having trouble with sequelize
fixing merge conflicts