fixing merge errors
moving config switching out orm for sequelize