Got stuck with sequelize, finished spikes tutorial :)
fixing conflicts