mpc merging back after updating for heroku